Merge 486232e into 6b1aa9e

theofidry · Jun 1, 2018 · 0b6f3dc · 0b6f3dc
2 parents 6b1aa9e + 486232e
commit 0b6f3dc
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,16 +7,13 @@ cache:
     - $HOME/.composer/cache
 
 php:
-    - 5.4
-    - 5.5
-    - 5.6
+    - 7.1
+    - 7.2
     - nightly
-    - hhvm
 
 matrix:
     allow_failures:
         - php: nightly
-        - php: hhvm
     fast_finish: true
 
 services:
@@ -27,7 +24,7 @@ before_install:
 
 install:
     - composer self-update
-    - composer install
+    - composer install --ignore-platform-reqs
     - rm -rf tests/Features/Functional/cache/*
 
 before_script:

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ default:
 
                 # or if you want to set the base path only for this context:
                 - Fidry\AliceBundleExtension\Context\Doctrine\AliceORMContext:
-                    basePath: %paths.base%/tests/Features/fixtures/ORM (default value)
+                    basePath: "%paths.base%/tests/Features/fixtures/ORM" (default value)
     # ...
     extensions:
         Fidry\AliceBundleExtension\Extension:

diff --git a/behat.yml b/behat.yml
@@ -1,19 +1,19 @@
 default:
     autoload:
-        '': %paths.base%/tests/Features/bootstrap
+        '': "%paths.base%/tests/Features/bootstrap"
     suites:
         orm_context:
-            paths: [ %paths.base%/tests/Features/ORM ]
+            paths: [ "%paths.base%/tests/Features/ORM" ]
             contexts:
                 - ORMFeatureContext
                 - Fidry\AliceBundleExtension\Context\Doctrine\AliceORMContext:
-                    basePath: %paths.base%/tests/Features/fixtures/ORM
+                    basePath: "%paths.base%/tests/Features/fixtures/ORM"
         odm_context:
-            paths: [ %paths.base%/tests/Features/ODM ]
+            paths: [ "%paths.base%/tests/Features/ODM" ]
             contexts:
                 - ODMFeatureContext
                 - Fidry\AliceBundleExtension\Context\Doctrine\AliceODMContext:
-                    basePath: %paths.base%/tests/Features/fixtures/ODM
+                    basePath: "%paths.base%/tests/Features/fixtures/ODM"
 
     extensions:
         Behat\Symfony2Extension:
@@ -23,4 +23,4 @@ default:
                 path: tests/Functional/AppKernel.php
                 bootstrap: tests/Functional/autoload.php
         Fidry\AliceBundleExtension\Extension:
-            fixtures_base_path: %paths.base%/tests/Features/fixtures
+            fixtures_base_path: "%paths.base%/tests/Features/fixtures"
diff --git a/composer.json b/composer.json
@@ -12,23 +12,23 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "behat/behat": "~3.0",
+        "php": "^7.1.3",
+        "behat/behat": "^3.0",
         "behat/symfony2-extension": "^2.0",
-        "hautelook/alice-bundle": "~1.0"
+        "hautelook/alice-bundle": "^2.0"
     },
     "require-dev": {
-        "doctrine/orm": "~2.4",
-        "doctrine/doctrine-bundle": "~1.2",
-        "doctrine/doctrine-fixtures-bundle": "~2.2",
-        "friendsofphp/php-cs-fixer": "~2.0@dev",
-        "phpunit/phpunit": "^4.8",
-        "symfony/console": "~2.1",
-        "symfony/expression-language": "^2.7",
-        "symfony/framework-bundle": "~2.1",
-        "symfony/yaml": "~2.1",
-        "theofidry/psysh-bundle": "~1.1",
-        "doctrine/mongodb-odm-bundle": "~3.0"
+        "doctrine/orm": "^2.4",
+        "doctrine/doctrine-bundle": "^1.2",
+        "doctrine/doctrine-fixtures-bundle": "^2.2",
+        "friendsofphp/php-cs-fixer": "^2.0",
+        "phpunit/phpunit": "^6.0",
+        "symfony/console": "^4.0",
+        "symfony/expression-language": "^4.0",
+        "symfony/framework-bundle": "^4.0",
+        "symfony/yaml": "^4.0",
+        "theofidry/psysh-bundle": "^3.3",
+        "doctrine/mongodb-odm-bundle": "^3.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Extension.php b/src/Extension.php
@@ -54,14 +54,14 @@ public function configure(ArrayNodeDefinition $builder)
                     ->addDefaultsIfNotSet()
                     ->cannotBeOverwritten()
                     ->children()
-                        ->booleanNode(HautelookAliceBundleConfiguration::ORM_DRIVER)
+                        ->booleanNode('orm')
                             ->defaultValue(null)
                         ->end()
-                        ->booleanNode(HautelookAliceBundleConfiguration::MONGODB_DRIVER)
+                        ->booleanNode('mongodb')
                             ->defaultValue(null)
                         ->end()
-                            ->booleanNode(HautelookAliceBundleConfiguration::PHPCR_DRIVER)
-                                ->defaultValue(null)
+                        ->booleanNode('phpcr')
+                            ->defaultValue(null)
                         ->end()
                     ->end()
                 ->end()

diff --git a/tests/Functional/AppKernel.php b/tests/Functional/AppKernel.php
@@ -12,8 +12,10 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle;
 use Fidry\AliceBundleExtension\Tests\Functional\Bundle\TestBundle\TestBundle;
+use Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle;
 use Fidry\PsyshBundle\PsyshBundle;
 use Hautelook\AliceBundle\HautelookAliceBundle;
+use Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
@@ -29,6 +31,8 @@ public function registerBundles()
             new TestBundle(),
             new PsyshBundle(),
             new DoctrineMongoDBBundle(),
+            new FidryAliceDataFixturesBundle(),
+            new NelmioAliceBundle(),
         ];
     }
 

diff --git a/tests/Functional/Bundle/TestBundle/Document/AnotherDummy.php b/tests/Functional/Bundle/TestBundle/Document/AnotherDummy.php
@@ -28,7 +28,7 @@ class AnotherDummy
     /**
      * @var string
      *
-     * @MongoDB\String()
+     * @MongoDB\Field(type="string")
      */
     public $name;
 }
diff --git a/tests/Functional/Bundle/TestBundle/Document/Dummy.php b/tests/Functional/Bundle/TestBundle/Document/Dummy.php
@@ -28,7 +28,7 @@ class Dummy
     /**
      * @var string
      *
-     * @MongoDB\String()
+     * @MongoDB\Field(type="string")
      */
     public $name;
 }
diff --git a/tests/Functional/config/config.yml b/tests/Functional/config/config.yml
@@ -1,7 +1,7 @@
 framework:
     secret: test
     router:
-        resource: %kernel.root_dir%/config/routing.yml
+        resource: "%kernel.root_dir%/config/routing.yml"
     session: ~
     test: ~
 
@@ -14,7 +14,7 @@ doctrine:
                 auto_mapping: true
     dbal:
         driver: pdo_sqlite
-        path: %kernel.cache_dir%/db.sqlite
+        path: "%kernel.cache_dir%/db.sqlite"
         charset: UTF8
 
 doctrine_mongodb:

diff --git a/tests/Functional/config/routing.yml b/tests/Functional/config/routing.yml
@@ -1,4 +1,4 @@
 api_root:
-    pattern: /test
+    path: /test
     defaults:
         _controller: TestBundle:Root:test