Merge pull request #239 from FriendsOfSymfony/symfony-2.8

dbu · dbu · commit a28853add01d · 2015-09-30T08:39:09.000+02:00
Test against Symfony 2.8
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
   - 7.0
   - hhvm
 
@@ -18,23 +19,27 @@ matrix:
       env:
         - PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
         - COVERAGE=true
-    - php: 5.5
+    - php: 5.6
       env: SYMFONY_VERSION='2.3.*'
-    - php: 5.5
+    - php: 5.6
       env:
         - SYMFONY_VERSION='2.4.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
-    - php: 5.5
+    - php: 5.6
       env:
         - SYMFONY_VERSION='2.5.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
-    - php: 5.5
+    - php: 5.6
       env:
         - SYMFONY_VERSION='2.6.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
-    - php: 5.5
+    - php: 5.6
+      env:
+        - SYMFONY_VERSION='2.7.*'
+        - FRAMEWORK_EXTRA_VERSION='~3.0'
+    - php: 5.6
       env:
-        - SYMFONY_VERSION='2.7.*@dev'
+        - SYMFONY_VERSION='2.8.*@dev'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
 
 before_script:
@@ -45,7 +50,7 @@ before_script:
   - sudo pip install -r Resources/doc/requirements.txt
 
 script:
-  - phpunit ${PHPUNIT_FLAGS}
+  - SYMFONY_DEPRECATIONS_HELPER=weak phpunit ${PHPUNIT_FLAGS}
   - make -C Resources/doc SPHINXOPTS='-nW' html
   - make -C Resources/doc spelling
 
diff --git a/DependencyInjection/FOSHttpCacheExtension.php b/DependencyInjection/FOSHttpCacheExtension.php
@@ -335,13 +335,11 @@ private function loadTest(ContainerBuilder $container, XmlFileLoader $loader, ar
             $loader->load('test_client.xml');
 
             if ($config['client']['varnish']['enabled']) {
-                $container->getDefinition($this->getAlias().'.test.client.varnish')
-                    ->setAbstract(false);
+                $loader->load('varnish_test_client.xml');
             }
 
             if ($config['client']['nginx']['enabled']) {
-                $container->getDefinition($this->getAlias().'.test.client.nginx')
-                    ->setAbstract(false);
+                $loader->load('nginx_test_client.xml');
             }
 
             $container->setAlias(
diff --git a/Resources/config/nginx.xml b/Resources/config/nginx.xml
@@ -16,12 +16,6 @@
             <argument>%fos_http_cache.proxy_client.nginx.purge_location%</argument>
             <argument type="service" id="fos_http_cache.proxy_client.nginx.guzzle_client" on-invalid="ignore"/>
         </service>
-
-        <service id="fos_http_cache.test.client.nginx"
-                 parent="fos_http_cache.test.client.abstract"
-                 abstract="true">
-            <argument index="0">%fos_http_cache.proxy_client.nginx.base_url%</argument>
-        </service>
     </services>
 
 </container>
diff --git a/Resources/config/nginx_test_client.xml b/Resources/config/nginx_test_client.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="fos_http_cache.test.client.nginx"
+                 parent="fos_http_cache.test.client.abstract">
+            <argument index="0">%fos_http_cache.proxy_client.nginx.base_url%</argument>
+        </service>
+    </services>
+
+</container>
diff --git a/Resources/config/varnish.xml b/Resources/config/varnish.xml
@@ -16,12 +16,6 @@
             <argument type="service" id="fos_http_cache.proxy_client.varnish.guzzle_client" on-invalid="ignore"/>
         </service>
 
-        <service id="fos_http_cache.test.client.varnish"
-                 parent="fos_http_cache.test.client.abstract"
-                 abstract="true">
-            <argument index="0">%fos_http_cache.proxy_client.varnish.base_url%</argument>
-        </service>
-
     </services>
 
 </container>
diff --git a/Resources/config/varnish_test_client.xml b/Resources/config/varnish_test_client.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="fos_http_cache.test.client.varnish"
+                 parent="fos_http_cache.test.client.abstract">
+            <argument index="0">%fos_http_cache.proxy_client.varnish.base_url%</argument>
+        </service>
+    </services>
+
+</container>
diff --git a/Tests/Unit/DependencyInjection/Compiler/HashGeneratorPassTest.php b/Tests/Unit/DependencyInjection/Compiler/HashGeneratorPassTest.php
@@ -43,7 +43,7 @@ public function testConfigNoContext()
         $config = $this->getBaseConfig();
         $this->extension->load(array($config), $container);
         $this->userContextListenerPass->process($container);
-        $this->assertCount(14, $container->getDefinitions());
+        $this->assertCount(13, $container->getDefinitions());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -335,13 +335,11 @@ private function loadTest(ContainerBuilder $container, XmlFileLoader $loader, ar`
`335`	`335`	`$loader->load('test_client.xml');`
`336`	`336`
`337`	`337`	`if ($config['client']['varnish']['enabled']) {`
`338`		`- $container->getDefinition($this->getAlias().'.test.client.varnish')`
`339`		`- ->setAbstract(false);`
	`338`	`+ $loader->load('varnish_test_client.xml');`
`340`	`339`	`}`
`341`	`340`
`342`	`341`	`if ($config['client']['nginx']['enabled']) {`
`343`		`- $container->getDefinition($this->getAlias().'.test.client.nginx')`
`344`		`- ->setAbstract(false);`
	`342`	`+ $loader->load('nginx_test_client.xml');`
`345`	`343`	`}`
`346`	`344`
`347`	`345`	`$container->setAlias(`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testConfigNoContext()`
`43`	`43`	`$config = $this->getBaseConfig();`
`44`	`44`	`$this->extension->load(array($config), $container);`
`45`	`45`	`$this->userContextListenerPass->process($container);`
`46`		`- $this->assertCount(14, $container->getDefinitions());`
	`46`	`+ $this->assertCount(13, $container->getDefinitions());`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`