Fixed CI

dantleech · dantleech · commit 22c8688c8a39 · 2015-12-16T12:08:06.000+01:00
diff --git a/bootstrap/bootstrap.php b/bootstrap/bootstrap.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $vendorDir = realpath(__DIR__.'/../../..');
 
 if (!$loader = include $vendorDir.'/autoload.php') {
@@ -13,7 +22,7 @@
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
-AnnotationRegistry::registerLoader(function($class) use ($loader) {
+AnnotationRegistry::registerLoader(function ($class) use ($loader) {
     $loader->loadClass($class);
 
     // this was class_exists($class, false) i.e. do not autoload.
diff --git a/bootstrap/kernel_bootstrap.php b/bootstrap/kernel_bootstrap.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $rootDir = realpath(__DIR__.'/../../../..');
 $phpUnitFile = $rootDir.'/phpunit.xml.dist';
 
diff --git a/resources/config/default.php b/resources/config/default.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 @trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
 
 $kernelRootDir = $container->getParameter('kernel.root_dir');
diff --git a/resources/config/dist/framework.php b/resources/config/dist/framework.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 @trigger_error('The resources/config/dist/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
 
 $config = array(
diff --git a/resources/config/dist/phpcr_odm.php b/resources/config/dist/phpcr_odm.php
@@ -1,10 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 @trigger_error('The resources/config/dist/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
 
 $config = array(
     'session' => array(
-        'backend' =>  '%phpcr_backend%',
+        'backend' => '%phpcr_backend%',
         'workspace' => '%phpcr_workspace%',
         'username' => '%phpcr_user%',
         'password' => '%phpcr_pass%',
@@ -34,7 +43,6 @@
 $phpcrOdmDocPrefix = sprintf('%s\Tests\Resources\Document', $bundleFQN);
 
 if (file_exists($phpcrOdmDocDir)) {
-
     $config['odm']['mappings']['test_additional'] = array(
         'type' => 'annotation',
         'prefix' => $phpcrOdmDocPrefix,
diff --git a/resources/config/doctrine_orm.php b/resources/config/doctrine_orm.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 @trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
 
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/doctrine_orm.yml');
diff --git a/resources/config/phpcr_odm.php b/resources/config/phpcr_odm.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 @trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
 
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/phpcr_odm.php');
diff --git a/resources/config/sonata_admin.php b/resources/config/sonata_admin.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 @trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
 
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/sonata_admin.yml');
diff --git a/resources/web/app_test.php b/resources/web/app_test.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Component\HttpFoundation\Request;
 
 require_once __DIR__.'/../../bootstrap/bootstrap.php';
diff --git a/resources/web/router.php b/resources/web/router.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $req = $_SERVER['REQUEST_URI'];
 $asset = preg_replace('/\?.*/', '', __DIR__.$req);
 
diff --git a/src/DataFixtures/PHPCR/LoadBaseData.php b/src/DataFixtures/PHPCR/LoadBaseData.php
@@ -25,11 +25,10 @@ public function load(ObjectManager $manager)
         @trigger_error('The '.__NAMESPACE__.'\LoadBaseData data fixture is deprecated since version 1.1 and will be removed in 2.0.', E_USER_DEPRECATED);
 
         $root = $manager->find(null, '/');
-        $base = new Generic;
+        $base = new Generic();
         $base->setNodename('test');
         $base->setParent($root);
         $manager->persist($base);
         $manager->flush();
     }
 }
-
diff --git a/src/Document/Content.php b/src/Document/Content.php
@@ -16,7 +16,7 @@
 @trigger_error('The '.__NAMESPACE.'\Content document is deprecated as of version 1.1 and will be removed in 2.0.', E_USER_DEPRECATED);
 
 /**
- * Test content document
+ * Test content document.
  *
  * Very simple, referenceable document.
  *
@@ -77,14 +77,13 @@ public function getName()
         return $this->name;
     }
 
-    public function getTitle() 
+    public function getTitle()
     {
         return $this->title;
     }
-    
+
     public function setTitle($title)
     {
         $this->title = $title;
     }
 }
-
diff --git a/src/Functional/BaseTestCase.php b/src/Functional/BaseTestCase.php
@@ -25,7 +25,7 @@
 abstract class BaseTestCase extends WebTestCase
 {
     /**
-     * Use this property to save the DbManagers
+     * Use this property to save the DbManagers.
      *
      * @var array
      */
@@ -127,7 +127,7 @@ public function getDbManager($type)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * This is overriden to set the default environment to 'phpcr'
      */
diff --git a/src/Functional/DbManager/ORM.php b/src/Functional/DbManager/ORM.php
@@ -16,7 +16,6 @@
 use Doctrine\Common\DataFixtures\ProxyReferenceRepository;
 use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
 use Doctrine\Common\Persistence\ManagerRegistry;
@@ -57,7 +56,7 @@ public function __construct(ContainerInterface $container)
     }
 
     /**
-     * Gets the Doctrine ManagerRegistry
+     * Gets the Doctrine ManagerRegistry.
      *
      * @return ManagerRegistry
      */
@@ -67,9 +66,10 @@ public function getRegistry()
     }
 
     /**
-     * Gets the Doctrine ObjectManager
+     * Gets the Doctrine ObjectManager.
      *
      * @param null $managerName
+     *
      * @return ObjectManager
      */
     public function getOm($managerName = null)
@@ -82,7 +82,7 @@ public function getOm($managerName = null)
     }
 
     /**
-     * Purge the database
+     * Purge the database.
      */
     public function purgeDatabase()
     {
@@ -99,7 +99,7 @@ public function purgeDatabase()
     public function loadFixtures(array $classNames)
     {
         $this->purgeDatabase();
-        $loader = new ContainerAwareLoader($this->container);;
+        $loader = new ContainerAwareLoader($this->container);
 
         foreach ($classNames as $className) {
             $this->loadFixtureClass($loader, $className);
@@ -127,6 +127,7 @@ protected function loadFixtureClass(Loader $loader, $className)
 
         if ($loader->hasFixture($fixture)) {
             unset($fixture);
+
             return;
         }
 
@@ -140,7 +141,7 @@ protected function loadFixtureClass(Loader $loader, $className)
     }
 
     /**
-     * Return the ORM Executor class
+     * Return the ORM Executor class.
      *
      * @return ORMExecutor
      */
diff --git a/src/Functional/DbManager/PHPCR.php b/src/Functional/DbManager/PHPCR.php
@@ -39,7 +39,7 @@ public function __construct(ContainerInterface $container)
     }
 
     /**
-     * Return the PHPCR ODM registry
+     * Return the PHPCR ODM registry.
      *
      * @return ManagerRegistry
      */
@@ -50,6 +50,7 @@ public function getRegistry()
 
     /**
      * @param null|string $managerName
+     *
      * @return DocumentManager
      */
     public function getOm($managerName = null)
@@ -62,24 +63,24 @@ public function getOm($managerName = null)
     }
 
     /**
-     * Purge the database
+     * Purge the database.
      *
-     * @param boolean $initialize If the ODM repository initializers should be executed.
+     * @param bool $initialize If the ODM repository initializers should be executed.
      */
     public function purgeRepository($initialize = false)
     {
         $this->getExecutor($initialize)->purge();
     }
 
     /**
-     * Load fixtures
+     * Load fixtures.
      *
      * @param array $classNames Fixture classes to load
-     * @param boolean $initialize  If the ODM repository initializers should be executed.
+     * @param bool  $initialize If the ODM repository initializers should be executed.
      */
     public function loadFixtures(array $classNames, $initialize = false)
     {
-        $loader = new ContainerAwareLoader($this->container);;
+        $loader = new ContainerAwareLoader($this->container);
 
         foreach ($classNames as $className) {
             $this->loadFixtureClass($loader, $className);
@@ -92,7 +93,7 @@ public function loadFixtures(array $classNames, $initialize = false)
      * Load the named fixture class with the given loader.
      *
      * @param \Doctrine\Common\DataFixtures\Loader $loader
-     * @param string $className
+     * @param string                               $className
      */
     public function loadFixtureClass($loader, $className)
     {
@@ -107,6 +108,7 @@ public function loadFixtureClass($loader, $className)
 
         if ($loader->hasFixture($fixture)) {
             unset($fixture);
+
             return;
         }
 
@@ -136,7 +138,7 @@ public function createTestNode()
     }
 
     /**
-     * Return the PHPCR Executor class
+     * Return the PHPCR Executor class.
      *
      * @return PHPCRExecutor
      */
diff --git a/src/HttpKernel/TestKernel.php b/src/HttpKernel/TestKernel.php
diff --git a/src/Phpunit/DatabaseTestListener.php b/src/Phpunit/DatabaseTestListener.php
diff --git a/src/Unit/Constraint/SchemaAcceptsXml.php b/src/Unit/Constraint/SchemaAcceptsXml.php
diff --git a/src/Unit/XmlSchemaTestCase.php b/src/Unit/XmlSchemaTestCase.php
diff --git a/tests/Functional/BaseTestCaseTest.php b/tests/Functional/BaseTestCaseTest.php
diff --git a/tests/HttpKernel/TestKernelTest.php b/tests/HttpKernel/TestKernelTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
