Merge branch 'master' into 1.2

Author: wouterj

.travis.yml

@@ -6,7 +6,6 @@ php:
     - 5.5
 
 env:
-  - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
   - SYMFONY_VERSION=2.4.*
   - SYMFONY_VERSION=dev-master
@@ -15,7 +14,7 @@ before_script:
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
 
-script: phpunit --coverage-text
+script: vendor/bin/phpunit -c phpunit.xml.dist --coverage-text
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

CHANGELOG.md

@@ -1,5 +1,20 @@
 Changelog
 =========
 
-* **2013-12-27**: Added XmlSchemaTestCase to test XML schema's
-* **2013-11-17**: Added DatabaseTestListener to support database testing
+* **2014-06-06**: Updated to PSR-4 autoloading
+
+1.1.0-RC2
+---------
+
+* **2014-06-11**: fetch manager by its name
+* **2014-04-24**: [DEPRECATE] Deprecated the `sonata_admin` bundle set
+* **2014-04-24**: added bundle sets: `sonata_admin_orm` and `sonata_admin_phpcr`
+* **2014-04-11**: dropped Symfony 2.2 compatibility
+
+1.1.0-RC1
+---------
+
+* **2013-04-07**: [DEPRECATE] Deprecated `LoadBaseData` DataFixture, it will be removed in 2.0
+* **2013-04-02**: [DEPRECATE] Deprecated `Content` document, it will be removed in 2.0
+* **2013-12-27**: Added `XmlSchemaTestCase` to test XML schema's
+* **2013-11-17**: Added `DatabaseTestListener` to support database testing

composer.json

@@ -10,18 +10,23 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "symfony/symfony": "~2.1",
+        "symfony/symfony": "~2.3",
         "symfony/monolog-bundle": "~2.1",
         "doctrine/common": "~2.4",
         "doctrine/doctrine-bundle": "1.*",
-        "doctrine/phpcr-odm": "1.0.*",
-        "doctrine/phpcr-bundle": "1.0.*",
+        "doctrine/phpcr-odm": "1.*",
+        "doctrine/phpcr-bundle": "1.*",
         "doctrine/data-fixtures": "1.0.*",
-        "jackalope/jackalope": "1.0.*",
-        "jackalope/jackalope-doctrine-dbal": "1.0.*"
+        "jackalope/jackalope": "1.*",
+        "jackalope/jackalope-doctrine-dbal": "1.*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Cmf\\Component\\Testing": "src/" }
+        "psr-4": {
+            "Symfony\\Cmf\\Component\\Testing\\": "src/"
+        }
     },
     "extra": {
         "branch-alias": {

resources/.travis.yml

@@ -5,9 +5,9 @@ php:
     - 5.4
 
 env:
-  - SYMFONY_VERSION=2.1.*
-  - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
+  - SYMFONY_VERSION=2.4.*
+  - SYMFONY_VERSION=dev-master
 
 before_script:
   - ./vendor/symfony-cmf/testing/bin/init-travis/phpcr_odm_doctrine_dbal.sh
@@ -17,3 +17,7 @@ script: phpunit --coverage-text
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
   email: "[email protected]"
+
+matrix:
+  allow_failures:
+    - env: SYMFONY_VERSION=dev-master

resources/config/default.php

@@ -6,8 +6,12 @@
 if (preg_match('&/([a-zA-Z]+?)Bundle&', $kernelRootDir, $matches)) {
     $bundleName = $matches[1].'Bundle';
     $bundleFQN = 'Symfony\\Cmf\\Bundle\\'.$matches[1].'Bundle';
-    $container->setParameter('cmf_testing.bundle_name', $bundleName);
-    $container->setParameter('cmf_testing.bundle_fqn', $bundleFQN);
+    if (!$container->hasParameter('cmf_testing.bundle_name')) {
+        $container->setParameter('cmf_testing.bundle_name', $bundleName);
+    }
+    if (!$container->hasParameter('cmf_testing.bundle_fqn')) {
+        $container->setParameter('cmf_testing.bundle_fqn', $bundleFQN);
+    }
 }
 
 $loader->import('dist/parameters.yml');

src/Symfony/Cmf/Component/Testing/DataFixtures/PHPCR/LoadBaseData.php renamed to src/DataFixtures/PHPCR/LoadBaseData.php

@@ -1,11 +1,24 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Symfony\Cmf\Component\Testing\DataFixtures\PHPCR;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\PHPCR\Document\Generic;
 
+/**
+ * @deprecated Deprecated as of Testing 1.1, will be removed in 2.0
+ */
 class LoadBaseData implements FixtureInterface
 {
     public function load(ObjectManager $manager)

src/Symfony/Cmf/Component/Testing/Document/Content.php renamed to src/Document/Content.php

@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Symfony\Cmf\Component\Testing\Document;
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
@@ -9,6 +19,9 @@
  *
  * Very simple, referenceable document.
  *
+ * @deprecated This Document is deprecated as of 1.1 and will be removed in 
+ * 2.0. Move the fixture to your own bundle instead.
+ *
  * @PHPCRODM\Document(referenceable=true)
  */
 class Content

src/Symfony/Cmf/Component/Testing/Functional/BaseTestCase.php renamed to src/Functional/BaseTestCase.php

@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Symfony\Cmf\Component\Testing\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

src/Symfony/Cmf/Component/Testing/Functional/DbManager/ORM.php renamed to src/Functional/DbManager/ORM.php

@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Symfony\Cmf\Component\Testing\Functional\DbManager;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -49,12 +59,13 @@ public function getRegistry()
     /**
      * Gets the Doctrine ObjectManager
      *
+     * @param null $managerName
      * @return ObjectManager
      */
-    public function getOm()
+    public function getOm($managerName = null)
     {
         if (!$this->om) {
-            $this->om = $this->getRegistry()->getManager();
+            $this->om = $this->getRegistry()->getManager($managerName);
         }
 
         return $this->om;

src/Symfony/Cmf/Component/Testing/Functional/DbManager/PHPCR.php renamed to src/Functional/DbManager/PHPCR.php

@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Symfony\Cmf\Component\Testing\Functional\DbManager;
 
 use Doctrine\Common\DataFixtures\Purger\PHPCRPurger;
@@ -25,10 +35,14 @@ public function getRegistry()
         return $this->container->get('doctrine_phpcr');
     }
 
-    public function getOm()
+    /**
+     * @param null|string $managerName
+     * @return DocumentManager
+     */
+    public function getOm($managerName = null)
     {
         if (!$this->om) {
-            $this->om = $this->getRegistry()->getManager();
+            $this->om = $this->getRegistry()->getManager($managerName);
         }
 
         return $this->om;