Merge branch 'master' into 5.3

Nardberjean · web-flow · commit abba4baadcbf · 2017-12-08T11:21:52.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,38 +9,154 @@ cache:
 matrix:
   fast_finish: true
   include:
-  - php: 5.4
+  - php: 7.0
     env:
-    - SYMFONY_VERSION="2.3"
-    - PHPUNIT=phpunit-4.8
+    - SYMFONY_VERSION="2.3.*"
+    - PHPUNIT=phpunit-5.7
     - TEST_LINT=`true`
-  - php: 5.4
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.0
     env:
-    - SYMFONY_VERSION="2.7"
-    - PHPUNIT=phpunit-4.8
+    - SYMFONY_VERSION="2.7.*"
+    - PHPUNIT=phpunit-5.7
     - TEST_LINT=`true`
-  - php: 5.4
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.0
     env:
     - SYMFONY_LTS="2"
     - PHPUNIT=phpunit-4.8
     - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.0
+    env:
+    - SYMFONY_LTS="3"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.1
+    env:
+    - SYMFONY_VERSION="2.3.*"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.1
+    env:
+    - SYMFONY_VERSION="2.7.*"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.1
+    env:
+    - SYMFONY_LTS="2"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.1
+    env:
+    - SYMFONY_LTS="3"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.1
+    env:
+    - SYMFONY_LTS="4.x-dev@dev"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.2
+    env:
+    - SYMFONY_VERSION="2.3.*"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.2
+    env:
+    - SYMFONY_VERSION="2.7.*"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.2
+    env:
+    - SYMFONY_LTS="2"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.2
+    env:
+    - SYMFONY_LTS="3"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: 7.2
+    env:
+    - SYMFONY_LTS="4.x-dev@dev"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - PHP_CS_FIXER=`true`
+    - SENSIO_SECURITY=`true`
+  - php: nightly
+    env:
+    - SYMFONY_VERSION="2.3.*"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - SENSIO_SECURITY=`true`
+  - php: nightly
+    env:
+    - SYMFONY_VERSION="2.7.*"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - SENSIO_SECURITY=`true`
+  - php: nightly
+    env:
+    - SYMFONY_LTS="2"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - SENSIO_SECURITY=`true`
+  - php: nightly
+    env:
+    - SYMFONY_LTS="3"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - SENSIO_SECURITY=`true`
+  - php: nightly
+    env:
+    - SYMFONY_LTS="4.x-dev@dev"
+    - PHPUNIT=phpunit-5.7
+    - TEST_LINT=`true`
+    - SENSIO_SECURITY=`true`
+  allow_failures:
+  - php: nightly
 
 before_install:
-  - echo $PHPUNIT
-  - pwd
-  - echo $HOME
-  - echo $TRAVIS_PHP_VERSION
-  - which composer
-  - ls /tmp
-  - php --ini
-  - xdebug=/home/travis/.phpenv/versions/$TRAVIS_PHP_VERSION/etc/conf.d/xdebug.ini
-  - if [[ -f $xdebug ]]; then cat $xdebug; cp $xdebug /tmp; phpenv config-rm xdebug.ini; fi
-  - xdebug_php=
-  - if [[ -f /tmp/xdebug.ini ]]; then xdebug_php='-c /tmp/xdebug.ini'; fi
-  - install --directory .travis/bin
-  - if [[ -v PHP_CS_FIXER ]]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar --output-document=.travis/bin/php-cs-fixer; fi
-  - if [[ -v PHPUNIT ]]; then wget https://phar.phpunit.de/${PHPUNIT}.phar --output-document=.travis/bin/$PHPUNIT; fi
-  - if [[ -v SENSIO_SECURITY ]]; then wget http://get.sensiolabs.org/security-checker.phar --output-document=.travis/bin/security-checker; fi
+- source /etc/os-release ; echo $VERSION
+- echo $PHPUNIT
+- pwd
+- echo $HOME
+- echo $TRAVIS_PHP_VERSION
+- which composer
+- ls /tmp
+- php --ini
+- xdebug=/home/travis/.phpenv/versions/$TRAVIS_PHP_VERSION/etc/conf.d/xdebug.ini
+- if [[ -f $xdebug ]]; then cat $xdebug; cp $xdebug /tmp; phpenv config-rm xdebug.ini; fi
+- xdebug_php=
+- if [[ -f /tmp/xdebug.ini ]]; then xdebug_php='-c /tmp/xdebug.ini'; fi
+- install --directory .travis/bin
+- if [[ -v PHP_CS_FIXER ]]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar --output-document=.travis/bin/php-cs-fixer; fi
+- if [[ -v PHPUNIT ]]; then wget https://phar.phpunit.de/${PHPUNIT}.phar --output-document=.travis/bin/$PHPUNIT; fi
+- if [[ -v SENSIO_SECURITY ]]; then wget http://get.sensiolabs.org/security-checker.phar --output-document=.travis/bin/security-checker; fi
 
 install:
   - composer validate
diff --git a/README.md b/README.md
@@ -64,3 +64,12 @@ Icon: https://material.io/icons/#ic_wallpaper
 ##### _string_ arguments
 * string arguments can officially be type-hinted from php 7.0
 * http://php.net/manual/en/functions.arguments.php
+
+### Versions
+#### PHP
+##### 5.5 TemplatingController::class in unit tests
+##### 5.6 __invoke(...$arguments) in VariadicController.php
+##### 7.0 (master)
+* declare(strict_types=1);
+* function f(): float
+* function s(string $s)
diff --git a/TemplatingController.php b/TemplatingController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /*
  * This file is part of the Symfony-Util package.
@@ -20,13 +21,13 @@ class TemplatingController
     protected $templating;
     protected $template;
 
-    public function __construct(EngineInterface $templating, $template = self::TEMPLATE)
+    public function __construct(EngineInterface $templating, string $template = self::TEMPLATE)
     {
         $this->templating = $templating;
         $this->template = $template;
     }
 
-    public function __invoke()
+    public function __invoke(): Response
     {
         return new Response($this->templating->render($this->template));
     }
diff --git a/VariadicController.php b/VariadicController.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony-Util package.
+ *
+ * (c) Jean-Bernard Addor
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SymfonyUtil\Controller;
+
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Templating\EngineInterface;
+
+class VariadicController
+{
+    const TEMPLATE = 'index.html.twig';
+    protected $templating;
+    protected $template;
+
+    public function __construct(EngineInterface $templating, $template = 'index.html.twig')
+    {
+        $this->templating = $templating;
+        $this->template = $template;
+    }
+
+    public function __invoke(...$arguments) // PHP 5.6+
+    {
+        // Variadic $arguments apparently not supported when empty by Symfony 3.3.6 ArgumentResolver
+        // and viewed as a regular array by knplabs/rad-resource-resolver v2.1
+
+        return new Response($this->templating->render($this->template, $arguments));
+    }
+}
diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
         {"name": "Community", "homepage": "https://github.com/symfony-util/controller-using-templating-http-foundation"}
     ],
     "require": {
+        "php": "^7.0",
         "symfony/http-foundation": "^2.0 || ^3.0 || ^4.0",
         "symfony/templating": "^2.0 || ^3.0 || ^4.0"
     },
@@ -25,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.3.x-dev"
+            "dev-master": "7.0.x-dev"
         }
     }
 }
diff --git a/tests/EngineAsArgumentControllerTest.php b/tests/EngineAsArgumentControllerTest.php
@@ -23,17 +23,15 @@ final class EngineAsArgumentControllerTest extends TestCase
     public function testCanBeCreated()
     {
         $this->assertInstanceOf(
-            // EngineAsArgumentController::class, // 5.4 < php
-            'SymfonyUtil\Controller\EngineAsArgumentController',
+            EngineAsArgumentController::class, // 5.4 < php
             new EngineAsArgumentController()
         );
     }
 
     public function testReturnsResponse()
     {
         $this->assertInstanceOf(
-            // Response::class, // 5.4 < php
-            'Symfony\Component\HttpFoundation\Response',
+            Response::class, // 5.4 < php
             (new EngineAsArgumentController())->__invoke(new TwigEngine(
                 new Twig_Environment(new Twig_Loader_Array(['index.html.twig' => 'Hello World!'])),
                 new TemplateNameParser()
diff --git a/tests/TemplatingControllerTest.php b/tests/TemplatingControllerTest.php
@@ -40,8 +40,7 @@ public function testCanBeCreated()
     public function testHomeCanBeCreated()
     {
         $this->assertInstanceOf(
-            // ::class, // 5.4 < php
-            'SymfonyUtil\Controller\TemplatingController',
+            TemplatingController::class, // 5.4 < php
             new HomeTemplatingController(new TwigEngine(
                 new Twig_Environment(new Twig_Loader_Array(['home.html.twig' => 'Hello World!'])),
                 new TemplateNameParser()
@@ -52,8 +51,7 @@ public function testHomeCanBeCreated()
     public function testEmptyReturnsResponse()
     {
         $this->assertInstanceOf(
-            // Response::class, // 5.4 < php
-            'Symfony\Component\HttpFoundation\Response',
+            Response::class, // 5.4 < php
             (new TemplatingController(new TwigEngine(
                 new Twig_Environment(new Twig_Loader_Array(['index.html.twig' => 'Hello World!'])),
                 new TemplateNameParser()
@@ -64,8 +62,7 @@ public function testEmptyReturnsResponse()
     public function testArrayReturnsResponse()
     {
         $this->assertInstanceOf(
-            // Response::class, // 5.4 < php
-            'Symfony\Component\HttpFoundation\Response',
+            Response::class, // 5.4 < php
             (new TemplatingController(new TwigEngine(
                 new Twig_Environment(new Twig_Loader_Array([
                     'index.html.twig' => '<ul>{% for item in 0 %}<li>{{ item }}</li>{% endfor %}</ul>',
diff --git a/tests/VariadicControllerTest.php b/tests/VariadicControllerTest.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Symfony-Util package.
+ *
+ * (c) Jean-Bernard Addor
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\TwigEngine;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Templating\TemplateNameParser;
+use SymfonyUtil\Controller\VariadicController;
+
+/**
+ * @covers \SymfonyUtil\Controller\VariadicController
+ * @requires PHP 5.6.0
+ */
+final class VariadicControllerTest extends TestCase
+{
+    public function testCanBeCreated()
+    {
+        $this->assertInstanceOf(
+            // VariadicController::class, // 5.4 < php (code is checked even if not executed!)
+            'SymfonyUtil\Controller\VariadicController',
+            new VariadicController(new TwigEngine(
+                new Twig_Environment(new Twig_Loader_Array(['index.html.twig' => 'Hello World!'])),
+                new TemplateNameParser()
+            ))
+        );
+    }
+
+    public function testEmptyReturnsResponse()
+    {
+        $this->assertInstanceOf(
+            // Response::class, // 5.4 < php (code is checked even if not executed!)
+            'Symfony\Component\HttpFoundation\Response',
+            (new VariadicController(new TwigEngine(
+                new Twig_Environment(new Twig_Loader_Array(['index.html.twig' => 'Hello World!'])),
+                new TemplateNameParser()
+            )))->__invoke()
+        );
+    }
+
+    public function testArrayReturnsResponse()
+    {
+        $this->assertInstanceOf(
+            // Response::class, // 5.4 < php (code is checked even if not executed!)
+            'Symfony\Component\HttpFoundation\Response',
+            (new VariadicController(new TwigEngine(
+                new Twig_Environment(new Twig_Loader_Array([
+                    'index.html.twig' => '<ul>{% for item in 0 %}<li>{{ item }}</li>{% endfor %}</ul>',
+                ])),
+                new TemplateNameParser()
+            )))->__invoke([
+                'One',
+                'Two',
+                'Three',
+            ])
+        );
+    }
+}
+
+// http://api.symfony.com/3.3/Symfony/Bridge/Twig/TwigEngine.html
+// http://api.symfony.com/3.3/Symfony/Bundle/TwigBundle/TwigEngine.html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+declare(strict_types=1);`
`2`	`3`
`3`	`4`	`/*`
`4`	`5`	`* This file is part of the Symfony-Util package.`
`@@ -20,13 +21,13 @@ class TemplatingController`
`20`	`21`	`protected $templating;`
`21`	`22`	`protected $template;`
`22`	`23`
`23`		`- public function __construct(EngineInterface $templating, $template = self::TEMPLATE)`
	`24`	`+ public function __construct(EngineInterface $templating, string $template = self::TEMPLATE)`
`24`	`25`	`{`
`25`	`26`	`$this->templating = $templating;`
`26`	`27`	`$this->template = $template;`
`27`	`28`	`}`
`28`	`29`
`29`		`- public function __invoke()`
	`30`	`+ public function __invoke(): Response`
`30`	`31`	`{`
`31`	`32`	`return new Response($this->templating->render($this->template));`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`{"name": "Community", "homepage": "https://github.com/symfony-util/controller-using-templating-http-foundation"}`
`10`	`10`	`],`
`11`	`11`	`"require": {`
	`12`	`+ "php": "^7.0",`
`12`	`13`	`"symfony/http-foundation": "^2.0 \|\| ^3.0 \|\| ^4.0",`
`13`	`14`	`"symfony/templating": "^2.0 \|\| ^3.0 \|\| ^4.0"`
`14`	`15`	`},`
`@@ -25,7 +26,7 @@`
`25`	`26`	`},`
`26`	`27`	`"extra": {`
`27`	`28`	`"branch-alias": {`
`28`		`- "dev-master": "5.3.x-dev"`
	`29`	`+ "dev-master": "7.0.x-dev"`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,15 @@ final class EngineAsArgumentControllerTest extends TestCase`
`23`	`23`	`public function testCanBeCreated()`
`24`	`24`	`{`
`25`	`25`	`$this->assertInstanceOf(`
`26`		`- // EngineAsArgumentController::class, // 5.4 < php`
`27`		`- 'SymfonyUtil\Controller\EngineAsArgumentController',`
	`26`	`+ EngineAsArgumentController::class, // 5.4 < php`
`28`	`27`	`new EngineAsArgumentController()`
`29`	`28`	`);`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`public function testReturnsResponse()`
`33`	`32`	`{`
`34`	`33`	`$this->assertInstanceOf(`
`35`		`- // Response::class, // 5.4 < php`
`36`		`- 'Symfony\Component\HttpFoundation\Response',`
	`34`	`+ Response::class, // 5.4 < php`
`37`	`35`	`(new EngineAsArgumentController())->__invoke(new TwigEngine(`
`38`	`36`	`new Twig_Environment(new Twig_Loader_Array(['index.html.twig' => 'Hello World!'])),`
`39`	`37`	`new TemplateNameParser()`