Merge pull request #100 from mmoreram/updated-dependency-and-travis

Updated dependency and travis
mmoreram · Nov 18, 2016 · d79de19 · d79de19
2 parents 023326f + a7f7683
commit d79de19
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,21 +2,18 @@ language: php
 
 sudo: false
 
-php:
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
-    - hhvm
-
 matrix:
     include:
-        - php: 5.4
+        - php: 5.6
           env: COMPOSER_OPTIONS="--prefer-lowest"
-        - php: 5.4
+        - php: 5.6
           env: $SYMFONY_VERSION="^2.8.0"
-        - php: 5.5.9
+        - php: 7.0
           env: $SYMFONY_VERSION="^3.0.0"
+        - php: 7.1
+          env: $SYMFONY_VERSION="^3.1.0"
+        - php: 5.6
+          env: $SYMFONY_VERSION="^3.1.0"
 
 before_install:
     - 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony:${SYMFONY_VERSION}; fi;'

diff --git a/Annotation/Entity.php b/Annotation/Entity.php
@@ -25,7 +25,7 @@ class Entity extends Annotation
     /**
      * @var string
      *
-     * Namespace of entity in a short namespace mode.
+     * Namespace of entity in a short namespace mode
      */
     public $class;
 

diff --git a/Annotation/Form.php b/Annotation/Form.php
@@ -54,7 +54,7 @@ class Form extends Annotation
      * @var validate
      *
      * Validates submited form if Request is handled.
-     * Name of field to set result.
+     * Name of field to set result
      */
     public $validate = false;
 

diff --git a/Provider/EntityProvider.php b/Provider/EntityProvider.php
@@ -125,8 +125,8 @@ public function evaluateEntityInstanceFactory(array $class)
             : $this->defaultFactoryMethod;
 
         $factoryStatic = isset($class['static'])
-            ? (boolean) $class['static']
-            : (boolean) $this->defaultFactoryStatic;
+            ? (bool) $class['static']
+            : (bool) $this->defaultFactoryStatic;
 
         $factory = class_exists($factoryClass)
             ? (

diff --git a/Resolver/EntityAnnotationResolver.php b/Resolver/EntityAnnotationResolver.php
@@ -202,7 +202,7 @@ public function evaluateMapping(AnnotationEntity $annotation, $entity)
                 }
 
                 $mapping[$mappingKey] = $parameterValue;
-            };
+            }
 
             $entityClass = get_class($entity);
             $instance = $this

diff --git a/Resolver/Paginator/PaginatorWheresEvaluator.php b/Resolver/Paginator/PaginatorWheresEvaluator.php
@@ -66,7 +66,7 @@ public function evaluate(
 
                 $whereValue = $this->addWildcards($annotationWhereParameter, $whereValue);
 
-                $optionalFilter = (boolean) isset($where[4])
+                $optionalFilter = (bool) isset($where[4])
                     ? $where[4]
                     : false;
 

diff --git a/Tests/UnitTest/Resolver/FormAnnotationResolverTest.php b/Tests/UnitTest/Resolver/FormAnnotationResolverTest.php
@@ -13,16 +13,16 @@
 
 namespace Mmoreram\ControllerExtraBundle\Tests\UnitTest\Resolver;
 
-use Mmoreram\ControllerExtraBundle\Annotation\Form;
-use Mmoreram\ControllerExtraBundle\Resolver\FormAnnotationResolver;
-use Mmoreram\ControllerExtraBundle\Tests\FakeBundle\Form\Type\FakeType;
 use PHPUnit_Framework_TestCase;
 use ReflectionMethod;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormRegistryInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 use Mmoreram\ControllerExtraBundle\Annotation\Abstracts\Annotation;
+use Mmoreram\ControllerExtraBundle\Annotation\Form;
+use Mmoreram\ControllerExtraBundle\Resolver\FormAnnotationResolver;
+use Mmoreram\ControllerExtraBundle\Tests\FakeBundle\Form\Type\FakeType;
 
 /**
  * Tests FormAnnotationResolver class.
@@ -72,8 +72,8 @@ class FormAnnotationResolverTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $this->formRegistry = $this->getMock('Symfony\Component\Form\FormRegistryInterface');
-        $this->formFactory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+        $this->formRegistry = $this->createMock('Symfony\Component\Form\FormRegistryInterface');
+        $this->formFactory = $this->createMock('Symfony\Component\Form\FormFactoryInterface');
 
         $requestParameterProvider = $this
             ->getMockBuilder('Mmoreram\ControllerExtraBundle\Provider\RequestParameterProvider')
@@ -114,7 +114,7 @@ public function setUp()
      */
     public function testFQDNUsesFormRegistry()
     {
-        $resolvedFormTypeInterface = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+        $resolvedFormTypeInterface = $this->createMock('Symfony\Component\Form\ResolvedFormTypeInterface');
         $resolvedFormTypeInterface->method('getInnerType')->willReturn(new FakeType());
 
         $class = 'Mmoreram\ControllerExtraBundle\Tests\FakeBundle\Form\Type\FakeType';

diff --git a/Tests/UnitTest/Resolver/PaginatorAnnotationResolverTest.php b/Tests/UnitTest/Resolver/PaginatorAnnotationResolverTest.php
@@ -48,7 +48,7 @@ private function getResolver($defaultName = 'test', $defaultPage = 1, $defaultLi
             ->disableOriginalConstructor()
             ->getMock();
 
-        $evaluator = $this->getMock('Mmoreram\ControllerExtraBundle\Resolver\Paginator\PaginatorEvaluatorCollector');
+        $evaluator = $this->createMock('Mmoreram\ControllerExtraBundle\Resolver\Paginator\PaginatorEvaluatorCollector');
 
         return new PaginatorAnnotationResolver(
             $doctrine,

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^5.4|^7.0",
+        "php": ">=5.6",
         "doctrine/common": "^2.5",
         "symfony/config": "^2.8|^3.0",
         "symfony/http-kernel": "^2.8|^3.0",
@@ -44,9 +44,9 @@
         "pagerfanta/pagerfanta": "~1.0",
         "knplabs/knp-paginator-bundle": "~2.5.1",
 
-        "phpunit/phpunit": "4.8.19",
-        "fabpot/php-cs-fixer": "1.11",
-        "mmoreram/php-formatter": "1.1.0"
+        "phpunit/phpunit": "^5.6.4",
+        "friendsofphp/php-cs-fixer": "^1.12.4",
+        "mmoreram/php-formatter": "^1.1.0"
     },
     "suggest": {
         "symfony/monolog-bundle": "To use the @Log annotation",
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     $mapping[$mappingKey] = $parameterValue;
-                };
+                }
                 $entityClass = get_class($entity);
                 $instance = $this
@@ Expand Down @@