Merge pull request #98 from mmoreram/feature/fixed-versions

Updated project for Symfony 3.0

.php_cs

@@ -0,0 +1,26 @@
+<?php
+
+$config = Symfony\CS\Config\Config::create()
+    // use SYMFONY_LEVEL:
+    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
+    // and extra fixers:
+    ->fixers([
+        'concat_with_spaces',
+        'multiline_spaces_before_semicolon',
+        'short_array_syntax',
+        '-remove_lines_between_uses',
+        '-empty_return',
+        '-phpdoc_var_without_name',
+        '-phpdoc_to_comment',
+    ]);
+
+if (null === $input->getArgument('path')) {
+    $config
+        ->finder(
+            Symfony\CS\Finder\DefaultFinder::create()
+                ->in('.')
+                ->exclude('vendor')
+        );
+}
+
+return $config;

.travis.yml

@@ -2,31 +2,24 @@ language: php
 
 sudo: false
 
-env:
-    COMPOSER_OPTIONS=""
-
 php:
     - 5.4
     - 5.5
     - 5.6
-    - hhvm
     - 7.0
+    - hhvm
 
 matrix:
     include:
         - php: 5.4
           env: COMPOSER_OPTIONS="--prefer-lowest"
-    allow_failures:
-        - php: 7.0
-
-env:
-    - SYMFONY_VERSION="~2.3"
+        - php: 5.4
+          env: $SYMFONY_VERSION="^2.8.0"
+        - php: 5.5.9
+          env: $SYMFONY_VERSION="^3.0.0"
 
 before_install:
-    - composer require --no-update symfony/monolog-bundle:~2.3
-    - composer require --no-update symfony/form:~2.3
-    - composer require --no-update doctrine/orm:~2.3
-    - composer require --no-update white-october/pagerfanta-bundle:~1.0
+    - 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony:${SYMFONY_VERSION}; fi;'
 
 install:
     - composer update --prefer-source --no-interaction ${COMPOSER_OPTIONS}

Annotation/Abstracts/AbstractResponse.php

@@ -14,12 +14,12 @@
 namespace Mmoreram\ControllerExtraBundle\Annotation\Abstracts;
 
 /**
- * Class AbstractResponse
+ * Class AbstractResponse.
  */
 abstract class AbstractResponse extends Annotation
 {
     /**
-     * @var integer
+     * @var int
      *
      * Status
      */
@@ -30,22 +30,22 @@ abstract class AbstractResponse extends Annotation
      *
      * Headers
      */
-    protected $headers = array();
+    protected $headers = [];
 
     /**
-     * Get response status
+     * Get response status.
      *
-     * @return integer Response status
+     * @return int Response status
      */
     public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * Get response headers
+     * Get response headers.
      *
-     * @return integer Response headers
+     * @return int Response headers
      */
     public function getHeaders()
     {

Annotation/Abstracts/Annotation.php

@@ -16,14 +16,14 @@
 use Doctrine\Common\Annotations\Annotation as DoctrineAnnotation;
 
 /**
- * Flush annotation driver
+ * Flush annotation driver.
  *
  * @Annotation
  */
 abstract class Annotation extends DoctrineAnnotation
 {
     /**
-     * return value
+     * return value.
      *
      * @return string Value
      */

Annotation/Entity.php

@@ -16,7 +16,7 @@
 use Mmoreram\ControllerExtraBundle\Annotation\Abstracts\Annotation;
 
 /**
- * Entity annotation driver
+ * Entity annotation driver.
  *
  * @Annotation
  */
@@ -44,7 +44,7 @@ class Entity extends Annotation
     public $mapping;
 
     /**
-     * @var boolean
+     * @var bool
      *
      * Mapping fallback
      */
@@ -55,10 +55,10 @@ class Entity extends Annotation
      *
      * Setters
      */
-    public $setters = array();
+    public $setters = [];
 
     /**
-     * @var boolean
+     * @var bool
      *
      * Persist entity
      */
@@ -72,7 +72,7 @@ class Entity extends Annotation
     public $notFoundException;
 
     /**
-     * return class
+     * return class.
      *
      * @return string Class
      */
@@ -82,7 +82,7 @@ public function getClass()
     }
 
     /**
-     * return name
+     * return name.
      *
      * @return string Name
      */
@@ -92,7 +92,7 @@ public function getName()
     }
 
     /**
-     * return mapping
+     * return mapping.
      *
      * @return array Mapping
      */
@@ -102,17 +102,17 @@ public function getMapping()
     }
 
     /**
-     * Get MappingFallback
+     * Get MappingFallback.
      *
-     * @return boolean MappingFallback
+     * @return bool MappingFallback
      */
     public function getMappingFallback()
     {
         return $this->mappingFallback;
     }
 
     /**
-     * return setters
+     * return setters.
      *
      * @return array Setters
      */
@@ -122,17 +122,17 @@ public function getSetters()
     }
 
     /**
-     * return persist
+     * return persist.
      *
-     * @return boolean persist
+     * @return bool persist
      */
     public function getPersist()
     {
         return $this->persist;
     }
 
     /**
-     * return the not found exception
+     * return the not found exception.
      *
      * @return array
      */

Annotation/Flush.php

@@ -16,7 +16,7 @@
 use Mmoreram\ControllerExtraBundle\Annotation\Abstracts\Annotation;
 
 /**
- * Flush annotation driver
+ * Flush annotation driver.
  *
  * @Annotation
  */
@@ -37,7 +37,7 @@ class Flush extends Annotation
     public $entity;
 
     /**
-     * return manager
+     * return manager.
      *
      * @return string Manager
      */
@@ -47,7 +47,7 @@ public function getManager()
     }
 
     /**
-     * return entity
+     * return entity.
      *
      * @return string Entity
      */

Annotation/Form.php

@@ -16,7 +16,7 @@
 use Mmoreram\ControllerExtraBundle\Annotation\Abstracts\Annotation;
 
 /**
- * Form annotation driver
+ * Form annotation driver.
  *
  * @Annotation
  */
@@ -44,7 +44,7 @@ class Form extends Annotation
     public $entity;
 
     /**
-     * @var boolean
+     * @var bool
      *
      * Handle request
      */
@@ -59,7 +59,7 @@ class Form extends Annotation
     public $validate = false;
 
     /**
-     * return name
+     * return name.
      *
      * @return string Name
      */
@@ -69,7 +69,7 @@ public function getName()
     }
 
     /**
-     * return class
+     * return class.
      *
      * @return string Class
      */
@@ -79,7 +79,7 @@ public function getClass()
     }
 
     /**
-     * return entity
+     * return entity.
      *
      * @return string Entity
      */
@@ -89,7 +89,7 @@ public function getEntity()
     }
 
     /**
-     * return handle request
+     * return handle request.
      *
      * @return string Handle Request
      */
@@ -99,7 +99,7 @@ public function getHandleRequest()
     }
 
     /**
-     * return validate value
+     * return validate value.
      *
      * @return string Validate param name
      */

Annotation/Get.php

@@ -13,13 +13,11 @@
 
 namespace Mmoreram\ControllerExtraBundle\Annotation;
 
-
 /**
- * Get annotation driver
+ * Get annotation driver.
  *
  * @Annotation
  */
 class Get extends RequestBagAnnotation
 {
-
 }

Annotation/JsonResponse.php

@@ -16,7 +16,7 @@
 use Mmoreram\ControllerExtraBundle\Annotation\Abstracts\AbstractResponse;
 
 /**
- * JsonResponse annotation driver
+ * JsonResponse annotation driver.
  *
  * @Annotation
  */

Annotation/Log.php

@@ -16,7 +16,7 @@
 use Mmoreram\ControllerExtraBundle\Annotation\Abstracts\Annotation;
 
 /**
- * Log annotation driver
+ * Log annotation driver.
  *
  * @Annotation
  */
@@ -114,7 +114,7 @@ class Log extends Annotation
     public $execute;
 
     /**
-     * return manager
+     * return manager.
      *
      * @return string Manager
      */
@@ -124,7 +124,7 @@ public function getLevel()
     }
 
     /**
-     * return execution
+     * return execution.
      *
      * @return string execution
      */

Annotation/ObjectManager.php

@@ -16,7 +16,7 @@
 use Mmoreram\ControllerExtraBundle\Annotation\Abstracts\Annotation;
 
 /**
- * Class ObjectManager
+ * Class ObjectManager.
  *
  * @Annotation
  */
@@ -37,7 +37,7 @@ class ObjectManager extends Annotation
     protected $name;
 
     /**
-     * Get Class
+     * Get Class.
      *
      * @return string Class
      */
@@ -47,7 +47,7 @@ public function getClass()
     }
 
     /**
-     * return name
+     * return name.
      *
      * @return string Name
      */