remove deprecation warnings on Symfony 3.4, new testing app folder structure (#297)

ElectricMaxxx · web-flow · commit fd93d8765769 · 2017-11-30T05:11:41.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-Tests/Resources/app/cache
-Tests/Resources/app/logs
+tests/Fixtures/App/var
+!tests/Fixtures/App/var/.gitempty
 composer.lock
 vendor
diff --git a/.travis.yml b/.travis.yml
@@ -26,30 +26,30 @@ cache:
     - $HOME/.composer/cache/files
 
 env:
-  matrix: SYMFONY_VERSION=3.4
+  matrix: SYMFONY_VERSION=^3.4@dev
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=48
-    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
+    - SYMFONY_DEPRECATIONS_HELPER=0
+    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
+    - KERNEL_CLASS=Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Kernel
+    - SYMFONY_PHPUNIT_VERSION=5.7
     - TEST_INSTALLATION=false
 
 matrix:
   include:
     - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
+      env: DEPS=dev SYMFONY_VERSION=^4.0@dev
+    - php: 7.1
+      env: DEPS=dev SYMFONY_VERSION=^3.4@dev
     - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION=3.3.*
-    - php: 5.6
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 7.0
-      env: SYMFONY_VERSION=3.1.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.2.*
-
+    - php: 7.1
+      env: SYMFONY_VERSION=3.3.*
     - env: TEST_INSTALLATION=true
+
   fast_finish: true
   allow_failures:
     - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
+      env: DEPS=dev SYMFONY_VERSION=^4.0@dev
     - env: TEST_INSTALLATION=true
 
 
@@ -63,8 +63,6 @@ before_install:
 
 install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
 
-before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
-
 script:
   - if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* **2017-11-15**: Removed php 5.6 and 7.0 support, removed Symfony 3.0.* and 3.1.* support
+
 2.1.0
 -----
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 Contributing
 ------------
 
-Symfony2 CMF is an open source, community-driven project. We follow the same
-guidelines as core Symfony2. If you'd like to contribute, please read the
+Symfony CMF is an open source, community-driven project. We follow the same
+guidelines as core Symfony. If you'd like to contribute, please read the
 [Contributing Code][1] part of the documentation. If you're submitting a pull
 request, please follow the guidelines in the [Submitting a Patch][2] section
 and use the [Pull Request Template][3].
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ ifdef BRANCH
 	VERSION=dev-${BRANCH}
 endif
 PACKAGE=symfony-cmf/menu-bundle
-
+export KERNEL_CLASS=Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Kernel
 list:
 	@echo 'test:                    will run all tests'
 	@echo 'unit_tests:               will run unit tests only'
@@ -31,4 +31,5 @@ include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
 include ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk
 include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk
 
+.PHONY: test
 test: unit_tests functional_tests_phpcr
diff --git a/README.md b/README.md
@@ -12,16 +12,16 @@ Branch | Travis | Coveralls |
 ------ | ------ | --------- |
 master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
 
-This bundle is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
+This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
 under the [MIT License](LICENSE).
 
 The MenuBundle provides menus from a doctrine object manager with the help of KnpMenuBundle.
 
 
 ## Requirements
 
-* PHP 5.6 / 7.0 / 7.1
-* Symfony 2.8 / 3.1 / 3.2 / 3.3
+* PHP 7.1
+* Symfony 2.8 / 3.3 / ^3.4@dev
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation
@@ -45,7 +45,7 @@ Pull requests are welcome. Please see our
 [CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
 guide.
 
-Unit and/or functional tests exist for this bundle. See the
+Unit and/or functional tests exist for this package. See the
 [Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
 for a guide to running the tests.
 
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^5.6|^7.0",
         "symfony/framework-bundle": "^2.8|^3.0",
-        "knplabs/knp-menu-bundle": "^2.0.0",
+        "knplabs/knp-menu-bundle": "^2.2.0",
         "knplabs/knp-menu": "^2.0.0"
     },
     "require-dev": {
@@ -24,7 +24,6 @@
         "symfony-cmf/testing": "^2.1@dev",
         "twig/twig": "^1.18|^2.0",
         "symfony-cmf/core-bundle": "^2.0",
-        "doctrine/phpcr-bundle": "^1.1",
         "doctrine/phpcr-odm": "^1.4.2"
     },
     "suggest": {
@@ -47,5 +46,6 @@
             "dev-master": "2.2-dev"
         }
     },
+    "minimum-stability":"dev",
     "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -25,8 +25,4 @@
             </exclude>
         </whitelist>
     </filter>
-    <php>
-        <server name="KERNEL_DIR" value="tests/Resources/app" />
-    </php>
-
 </phpunit>
diff --git a/tests/Fixtures/App/Admin/TestContentAdmin.php b/tests/Fixtures/App/Admin/TestContentAdmin.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Admin;
+namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Admin;
 
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
diff --git a/tests/Fixtures/App/DataFixtures/PHPCR/LoadMenuData.php b/tests/Fixtures/App/DataFixtures/PHPCR/LoadMenuData.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\DataFixtures\PHPCR;
+namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\DataFixtures\PHPCR;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\PHPCR\DocumentManager;
 use PHPCR\Util\NodeHelper;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode;
-use Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document\Content;
+use Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Document\Content;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 
 class LoadMenuData implements FixtureInterface
diff --git a/tests/Fixtures/App/Document/Content.php b/tests/Fixtures/App/Document/Content.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document;
+namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Document;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCR;
diff --git a/tests/Fixtures/App/Kernel.php b/tests/Fixtures/App/Kernel.php
@@ -9,10 +9,12 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App;
+
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
-class AppKernel extends TestKernel
+class Kernel extends TestKernel
 {
     public function configure()
     {
diff --git a/tests/Fixtures/App/config/cmf_menu.yml b/tests/Fixtures/App/config/cmf_menu.yml
diff --git a/tests/Fixtures/App/config/config.php b/tests/Fixtures/App/config/config.php
diff --git a/tests/Fixtures/App/config/routing.php b/tests/Fixtures/App/config/routing.php
diff --git a/tests/Fixtures/App/config/routing/test.yml b/tests/Fixtures/App/config/routing/test.yml
@@ -0,0 +1,27 @@
+test_index:
+    path: /
+    defaults:
+        _controller: Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Controller\TestController::indexAction
+
+render_test:
+    path: /render-test
+    defaults:
+        _controller: Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Controller\TestController::renderAction
+
+link_test_route:
+    path: /link_test_route
+
+link_test_route_with_params:
+    path: /link_test_route/hello/{bar}/{foo}
+    defaults:
+        _controller: Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Controller\TestController::linkTestRouteAction
+
+current_menu_item_default:
+    path: /cmi/default
+    defaults:
+        _controller: Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Controller\VoterController::defaultAction
+
+current_menu_item_request_content_identity:
+    path: /cmi/request_content_identity
+    defaults:
+        _controller: Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Controller\VoterController::requestContentIdentityAction
diff --git a/tests/Fixtures/App/config/test-services.xml b/tests/Fixtures/App/config/test-services.xml
@@ -5,19 +5,19 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="cmf_menu_test.content_admin" class="Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Admin\TestContentAdmin">
+        <service id="cmf_menu_test.content_admin" class="Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Admin\TestContentAdmin">
             <tag name="sonata.admin" manager_type="doctrine_phpcr" group="Test" label="Test Content" />
 
             <argument/>
-            <argument>Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document\Content</argument>
+            <argument>Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Document\Content</argument>
             <argument>SonataAdminBundle:CRUD</argument>
 
         </service>
 
         <service id="cmf_menu_test.menu_voter.parent"
             class="Symfony\Cmf\Bundle\MenuBundle\Voter\RequestParentContentIdentityVoter">
             <argument>contentDocument</argument>
-            <argument>Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document\Post</argument>
+            <argument>Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Document\Post</argument>
 
             <tag name="knp_menu.voter" request="true"/>
         </service>
diff --git a/tests/Fixtures/App/var/.gitempty b/tests/Fixtures/App/var/.gitempty
diff --git a/tests/Fixtures/fixtures/config/config1.xml b/tests/Fixtures/fixtures/config/config1.xml
diff --git a/tests/Fixtures/fixtures/config/config2.xml b/tests/Fixtures/fixtures/config/config2.xml
diff --git a/tests/Functional/Doctrine/Phpcr/MenuNodeTest.php b/tests/Functional/Doctrine/Phpcr/MenuNodeTest.php
@@ -14,7 +14,7 @@
 use Doctrine\ODM\PHPCR\Document\Generic;
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode;
-use Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document\Content;
+use Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\Document\Content;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 
 class MenuNodeTest extends BaseTestCase
diff --git a/tests/Functional/RenderingTest.php b/tests/Functional/RenderingTest.php
@@ -18,7 +18,7 @@ class RenderingTest extends BaseTestCase
     protected function setUp()
     {
         $this->db('PHPCR')->loadFixtures([
-            'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\DataFixtures\PHPCR\LoadMenuData',
+            'Symfony\Cmf\Bundle\MenuBundle\Tests\Fixtures\App\DataFixtures\PHPCR\LoadMenuData',
         ]);
     }
 
@@ -59,7 +59,7 @@ protected function assertMenu($expectedItems, \DOMDocument $menu)
         $xpath = new \DOMXpath($menu);
         $menuItems = [];
         foreach ($xpath->query('//ul/li/*[self::span or self::a]') as $menuItem) {
-            $menuItems[$menuItem->textContent] = $menuItem->nodeName === 'span'
+            $menuItems[$menuItem->textContent] = 'span' === $menuItem->nodeName
                 ? null
                 : $menuItem->getAttribute('href')
             ;
diff --git a/tests/Resources/app/config/routing/test.yml b/tests/Resources/app/config/routing/test.yml
diff --git a/tests/Unit/DependencyInjection/XmlSchemaTest.php b/tests/Unit/DependencyInjection/XmlSchemaTest.php
@@ -18,7 +18,7 @@ class XmlSchemaTest extends XmlSchemaTestCase
     public function testSchema()
     {
         $xmlFiles = array_map(function ($file) {
-            return __DIR__.'/../../Resources/Fixtures/config/'.$file;
+            return __DIR__.'/../../Fixtures/fixtures/config/'.$file;
         }, [
             'config1.xml',
             'config2.xml',
diff --git a/tests/Unit/QuietFactoryTest.php b/tests/Unit/QuietFactoryTest.php
@@ -54,6 +54,6 @@ public function testDisallowEmptyItemsReturnsNull()
 
         $factory = new QuietFactory($this->innerFactory->reveal(), $this->logger->reveal(), false);
 
-        $this->assertEquals(null, $factory->createItem('Home', ['route' => 'not_existent']));
+        $this->assertNull($factory->createItem('Home', ['route' => 'not_existent']));
     }
 }
