Merge pull request rikbruil#20 from rikbruil/housekeeping

Some general housekeeping

Author: rikbruil

.gitignore

@@ -1,3 +1,4 @@
 build/
 vendor/
+.php_cs.cache
 composer.lock

.php_cs

@@ -1,22 +1,26 @@
 <?php
 
-$finder = (new Symfony\Component\Finder\Finder())
-    ->files()
-    ->name('*.php')
-    ->in(__DIR__ . '/src')
-    ->in(__DIR__ . '/spec');
+$finder = PhpCsFixer\Finder::create()
+    ->exclude(['vendor', 'build'])
+    ->in(__DIR__);
 
-return Symfony\CS\Config::create()
-    ->fixers([
-        'align_double_arrow',
-        'align_equals',
-        'concat_with_spaces',
-        'header_comment',
-        'logical_not_operators_with_successor_space',
-        'multiline_spaces_before_semicolon',
-        'ordered_use',
-        'phpdoc_order',
-        'strict',
-        'strict_param',
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        'binary_operator_spaces' => [
+            'align_double_arrow' => true,
+            'align_equals' => true,
+        ],
+        'concat_space' => ['spacing' => 'one'],
+        'not_operator_with_successor_space' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'strict_comparison' => true,
+        'strict_param' => true,
     ])
-    ->finder($finder);
+    ->setFinder($finder);

composer.json

@@ -27,7 +27,7 @@
   "require-dev": {
     "phpspec/phpspec": "^2.0",
     "henrikbjorn/phpspec-code-coverage": "^2.0",
-    "friendsofphp/php-cs-fixer": "^1.12",
+    "friendsofphp/php-cs-fixer": "^2.0",
     "satooshi/php-coveralls": "^1.0"
   },
   "extra": {

spec/SpecificationRepositorySpec.php

@@ -11,6 +11,7 @@
 use Rb\Specification\Doctrine\Exception\LogicException;
 use Rb\Specification\Doctrine\Result\ModifierInterface;
 use Rb\Specification\Doctrine\SpecificationInterface;
+use Rb\Specification\Doctrine\SpecificationRepositoryStub;
 
 class SpecificationRepositorySpec extends ObjectBehavior
 {
@@ -22,7 +23,7 @@ class SpecificationRepositorySpec extends ObjectBehavior
 
     public function let(EntityManager $entityManager, ClassMetadata $classMetadata)
     {
-        $this->beAnInstanceOf('Rb\Specification\Doctrine\SpecificationRepositoryStub');
+        $this->beAnInstanceOf(SpecificationRepositoryStub::class);
         $this->beConstructedWith($entityManager, $classMetadata);
     }
 

spec/SpecificationRepositoryStub.php

@@ -4,7 +4,7 @@
 
 use Doctrine\ORM\EntityRepository;
 
-class SpecificationRepositoryStub extends EntityRepository implements SpecificationAware
+class SpecificationRepositoryStub extends EntityRepository implements SpecificationAwareInterface
 {
     use SpecificationRepositoryTrait;
 }

src/AbstractSpecification.php

@@ -24,6 +24,14 @@ public function __construct($field, $dqlAlias = null)
         $this->dqlAlias = $dqlAlias;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isSatisfiedBy($value)
+    {
+        return true;
+    }
+
     /**
      * Create a formatted string for the given property prefixed with the DQL alias.
      *
@@ -56,12 +64,4 @@ protected function createAliasedName($value, $dqlAlias)
 
         return sprintf('%s.%s', $dqlAlias, $value);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isSatisfiedBy($value)
-    {
-        return true;
-    }
 }

src/Query/Join.php

@@ -60,9 +60,9 @@ public function __construct($field, $newAlias, $dqlAlias = null)
     /**
      * @param string $type
      *
-     * @return $this
-     *
      * @throws InvalidArgumentException
+     *
+     * @return $this
      */
     public function setType($type)
     {
@@ -75,7 +75,7 @@ public function setType($type)
         }
 
         $this->type = $type;
-        
+
         return $this;
     }
 

src/Query/OrderBy.php

@@ -14,13 +14,13 @@ class OrderBy extends AbstractSpecification
     const ASC  = 'ASC';
     const DESC = 'DESC';
 
-    private static $validOrder = [self::ASC, self::DESC];
-
     /**
      * @var string
      */
     protected $order;
 
+    private static $validOrder = [self::ASC, self::DESC];
+
     /**
      * @param string      $field
      * @param string      $order

src/Specification.php

@@ -27,6 +27,8 @@ class Specification extends ArrayCollection implements SpecificationInterface
      */
     public function __construct(array $elements = [])
     {
+        parent::__construct();
+
         $this->setChildren($elements);
     }
 

src/SpecificationAware.php src/SpecificationAwareInterface.phpsrc/SpecificationAware.php renamed to src/SpecificationAwareInterface.php

@@ -8,7 +8,7 @@
 /**
  * SpecificationAware can be used to implement custom repository.
  */
-interface SpecificationAware
+interface SpecificationAwareInterface
 {
     /**
      * Get the query after matching with given specification.