[Finder] Fixed typos, CS and small errors.

symfony · jfsimon · Apr 21, 2012 · Apr 21, 2012 · Apr 21, 2012 · Apr 21, 2012
commit aa84e2d6e5a5d8feefec69aecdbe93c6c0e7d24c
diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
@@ -154,10 +154,11 @@ private function buildNamesCommand(Command $command, array $names, $not = false)
 
             // Fixes 'not search' regex problem.
             if ($expr->isRegex()) {
-                $expr->prepend($expr->hasStartFlag() ? '/' : '/.*')->setStartFlag(false)->setStartJoker(true);
+                $regex = $expr->getRegex();
+                $regex->prepend($regex->hasStartFlag() ? '/' : '/.*')->setStartFlag(false)->setStartJoker(true);
 
-                if (!$expr->hasEndFlag()) {
-                    $expr->setEndJoker(true);
+                if (!$regex->hasEndFlag()) {
+                    $regex->setEndJoker(true);
                 }
             }
 
@@ -280,12 +281,23 @@ private function buildContainsCommand(Command $command, array $contains, $not =
     private function buildSortCommand(Command $command, $sort)
     {
         switch ($sort) {
-            case SortableIterator::SORT_BY_NAME:          $format = null;  break;
-            case SortableIterator::SORT_BY_TYPE:          $format = '%y';  break;
-            case SortableIterator::SORT_BY_ACCESSED_TIME: $format = '%A@'; break;
-            case SortableIterator::SORT_BY_CHANGED_TIME:  $format = '%C@'; break;
-            case SortableIterator::SORT_BY_MODIFIED_TIME: $format = '%T@'; break;
-            default: throw new \InvalidArgumentException('Unknown sort options: '.$sort.'.');
+            case SortableIterator::SORT_BY_NAME:
+                $format = null;
+                break;
+            case SortableIterator::SORT_BY_TYPE:
+                $format = '%y';
+                break;
+            case SortableIterator::SORT_BY_ACCESSED_TIME:
+                $format = '%A@';
+                break;
+            case SortableIterator::SORT_BY_CHANGED_TIME:
+                $format = '%C@';
+                break;
+            case SortableIterator::SORT_BY_MODIFIED_TIME:
+                $format = '%T@';
+                break;
+            default:
+                throw new \InvalidArgumentException('Unknown sort options: '.$sort.'.');
         }
 
         $command->get('find')->add('-printf')->arg($format.' %h/%f\\n');

diff --git a/src/Symfony/Component/Finder/Exception/AdapterFailureException.php b/src/Symfony/Component/Finder/Exception/AdapterFailureException.php
@@ -18,17 +18,17 @@
  *
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-class AdapterFailureException extends \RuntimeException
+class AdapterFailureException extends \RuntimeException implements ExceptionInterface
 {
     /**
      * @var \Symfony\Component\Finder\Adapter\AdapterInterface
      */
     private $adapter;
 
     /**
-     * @param \Symfony\Component\Finder\Adapter\AdapterInterface $adapter
-     * @param string|null                                        $message
-     * @param \Exception|null                                    $previous
+     * @param AdapterInterface $adapter
+     * @param string|null      $message
+     * @param \Exception|null  $previous
      */
     public function __construct(AdapterInterface $adapter, $message = null, \Exception $previous = null)
     {
@@ -37,7 +37,7 @@ public function __construct(AdapterInterface $adapter, $message = null, \Excepti
     }
 
     /**
-     * @return \Symfony\Component\Finder\Adapter\AdapterInterface
+     * {@inheritdoc}
      */
     public function getAdapter()
     {

diff --git a/src/Symfony/Component/Finder/Exception/ExceptionInterface.php b/src/Symfony/Component/Finder/Exception/ExceptionInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\Finder\Exception;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+interface ExceptionInterface
+{
+    /**
+     * @return \Symfony\Component\Finder\Adapter\AdapterInterface
+     */
+    function getAdapter();
+}
diff --git a/src/Symfony/Component/Finder/Expression/Expression.php b/src/Symfony/Component/Finder/Expression/Expression.php
@@ -54,17 +54,6 @@ public function __toString()
         return $this->render();
     }
 
-    /**
-     * @param string $method
-     * @param array  $arguments
-     *
-     * @return mixed
-     */
-    public function __call($method, array $arguments)
-    {
-        return call_user_func_array(array($this->value, $method), $arguments);
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Finder;
 
 use Symfony\Component\Finder\Adapter;
-use Symfony\Component\Finder\Exception\AdapterFailureException;
+use Symfony\Component\Finder\Exception\ExceptionInterface;
 
 /**
  * Finder allows to build rules to find files and directories.
@@ -82,7 +82,7 @@ public static function create()
      * @param Adapter\AdapterInterface $adapter  An adapter instance
      * @param int                      $priority Highest is selected first
      *
-     * @return \Symfony\Component\Finder\Finder The current Finder instance
+     * @return Finder The current Finder instance
      */
     public function register(Adapter\AdapterInterface $adapter, $priority = 0)
     {
@@ -97,7 +97,7 @@ public function register(Adapter\AdapterInterface $adapter, $priority = 0)
     /**
      * Removes all adapters registered in the finder.
      *
-     * @return \Symfony\Component\Finder\Finder The current Finder instance
+     * @return Finder The current Finder instance
      */
     public function removeAdapters()
     {
@@ -107,7 +107,7 @@ public function removeAdapters()
     }
 
     /**
-     * Returns reegistered adapters ordered by priority without extra informations.
+     * Returns registered adapters ordered by priority without extra information.
      *
      * @return \Symfony\Component\Finder\Adapter\AdapterInterface[]
      */
@@ -654,7 +654,7 @@ private function searchInDirectory($dir)
                 return $this
                     ->buildAdapter($adapter['adapter'])
                     ->searchInDirectory($dir);
-            } catch(AdapterFailureException $e) {
+            } catch(ExceptionInterface $e) {
                 continue;
             }
         }

diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php
@@ -60,7 +60,7 @@ public function __toString()
      *
      * @return Command New Command instance
      */
-    static public function create(Command $parent = null)
+    public static function create(Command $parent = null)
     {
         return new self($parent);
     }
@@ -72,7 +72,7 @@ static public function create(Command $parent = null)
      *
      * @return string The escaped string
      */
-    static public function escape($input)
+    public static function escape($input)
     {
         return escapeshellcmd($input);
     }
@@ -84,7 +84,7 @@ static public function escape($input)
      *
      * @return string The quoted string
      */
-    static public function quote($input)
+    public static function quote($input)
     {
         return escapeshellarg($input);
     }

diff --git a/src/Symfony/Component/Finder/Tests/Expression/GlobTest.php b/src/Symfony/Component/Finder/Tests/Expression/GlobTest.php
@@ -13,9 +13,6 @@
 
 use Symfony\Component\Finder\Expression\Expression;
 
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
 class GlobTest extends \PHPUnit_Framework_TestCase
 {
     /**

diff --git a/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php b/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php
@@ -13,9 +13,6 @@
 
 use Symfony\Component\Finder\Expression\Expression;
 
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
 class RegexTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -25,8 +22,8 @@ public function testHasFlags($regex, $start, $end)
     {
         $expr = new Expression($regex);
 
-        $this->assertEquals($start, $expr->hasStartFlag());
-        $this->assertEquals($end,   $expr->hasEndFlag());
+        $this->assertEquals($start, $expr->getRegex()->hasStartFlag());
+        $this->assertEquals($end,   $expr->getRegex()->hasEndFlag());
     }
 
     /**
@@ -36,8 +33,8 @@ public function testHasJokers($regex, $start, $end)
     {
         $expr = new Expression($regex);
 
-        $this->assertEquals($start, $expr->hasStartJoker());
-        $this->assertEquals($end,   $expr->hasEndJoker());
+        $this->assertEquals($start, $expr->getRegex()->hasStartJoker());
+        $this->assertEquals($end,   $expr->getRegex()->hasEndJoker());
     }
 
     /**
@@ -46,7 +43,7 @@ public function testHasJokers($regex, $start, $end)
     public function testSetFlags($regex, $start, $end, $expected)
     {
         $expr = new Expression($regex);
-        $expr->setStartFlag($start)->setEndFlag($end);
+        $expr->getRegex()->setStartFlag($start)->setEndFlag($end);
 
         $this->assertEquals($expected, $expr->render());
     }
@@ -57,15 +54,15 @@ public function testSetFlags($regex, $start, $end, $expected)
     public function testSetJokers($regex, $start, $end, $expected)
     {
         $expr = new Expression($regex);
-        $expr->setStartJoker($start)->setEndJoker($end);
+        $expr->getRegex()->setStartJoker($start)->setEndJoker($end);
 
         $this->assertEquals($expected, $expr->render());
     }
 
     public function testOptions()
     {
         $expr = new Expression('~abc~is');
-        $expr->removeOption('i')->addOption('m');
+        $expr->getRegex()->removeOption('i')->addOption('m');
 
         $this->assertEquals('~abc~sm', $expr->render());
     }
@@ -74,10 +71,10 @@ public function testMixFlagsAndJokers()
     {
         $expr = new Expression('~^.*abc.*$~is');
 
-        $expr->setStartFlag(false)->setEndFlag(false)->setStartJoker(false)->setEndJoker(false);
+        $expr->getRegex()->setStartFlag(false)->setEndFlag(false)->setStartJoker(false)->setEndJoker(false);
         $this->assertEquals('~abc~is', $expr->render());
 
-        $expr->setStartFlag(true)->setEndFlag(true)->setStartJoker(true)->setEndJoker(true);
+        $expr->getRegex()->setStartFlag(true)->setEndFlag(true)->setStartJoker(true)->setEndJoker(true);
         $this->assertEquals('~^.*abc.*$~is', $expr->render());
     }
 

diff --git a/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php b/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php
@@ -51,7 +51,7 @@ public function isSupported()
     /**
      * {@inheritdoc}
      */
-    function getName()
+    public function getName()
     {
         return 'yes';
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,9 +13,6 @@ @@
     use Symfony\Component\Finder\Expression\Expression;
-    /**
-     * @author Jean-François Simon <contact@jfsimon.fr>
-     */
     class GlobTest extends \PHPUnit_Framework_TestCase
     {
         /**
@@ Expand Down @@