Merge branch 'platform:master' into 'studio:master'

ezsystems · Sep 16, 2015 · 215a689 · 215a689
2 parents 3de1f17 + b117c01
commit 215a689
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -21,6 +21,25 @@ default:
     # default profile: no suites
     suites: ~
 
+platformui:
+      suites:
+          standard:
+              paths: [ vendor/ezsystems/platform-ui-bundle/Features/Standard ]
+              contexts:
+                  - EzSystems\PlatformUIBundle\Features\Context\PlatformUI:
+                      uri: /ez
+          CopyMoveDelete:
+              paths: [ vendor/ezsystems/platform-ui-bundle/Features/CopyMoveDelete ]
+              contexts:
+                  - EzSystems\PlatformUIBundle\Features\Context\PlatformUI:
+                      uri: /ez
+
+core:
+    suites:
+        console:
+            paths: [ vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishCoreBundle/Features/Console]
+            contexts: [ eZ\Bundle\EzPublishCoreBundle\Features\Context\ConsoleContext ]
+
 rest:
     suites:
         fullJson:

diff --git a/composer.json b/composer.json
@@ -30,10 +30,10 @@
         "incenteev/composer-parameter-handler": "~2.0",
         "tedivm/stash-bundle": "0.4.*",
         "ezsystems/ezpublish-kernel": "~6.0@dev",
-        "ezsystems/repository-forms": "~0.1@dev",
+        "ezsystems/repository-forms": "~1.0.0@dev",
         "ezsystems/ezplatform-solr-search-engine": "~1.0.0@dev",
-        "ezsystems/platform-ui-bundle": "~0.8@dev",
-        "ezsystems/platform-ui-assets-bundle": "~0.2",
+        "ezsystems/platform-ui-bundle": "~1.0.0@dev",
+        "ezsystems/platform-ui-assets-bundle": "~1.0.0@dev",
         "ezsystems/demobundle": "~6.0@dev",
         "ezsystems/comments-bundle": "~6.0@dev",
         "ezsystems/privacy-cookie-bundle": "~0.1",

diff --git a/ezpublish/EzPublishKernel.php b/ezpublish/EzPublishKernel.php
@@ -58,6 +58,7 @@ public function registerBundles()
             case 'test':
             case 'behat':
                 $bundles[] = new EzSystems\BehatBundle\EzSystemsBehatBundle();
+                $bundles[] = new EzSystems\PlatformBehatBundle\EzPlatformBehatBundle();
                 // No break, test also needs dev bundles
             case 'dev':
                 $bundles[] = new eZ\Bundle\EzPublishDebugBundle\EzPublishDebugBundle();

diff --git a/ezpublish/console b/ezpublish/console
@@ -5,23 +5,22 @@
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
 //umask( 0000 );
 
-set_time_limit( 0 );
+set_time_limit(0);
 
 // Use autoload over boostrap here so we don't need to keep the generated files in git
-require_once __DIR__.'/autoload.php';
-require_once __DIR__.'/EzPublishKernel.php';
+require_once __DIR__ . '/autoload.php';
+require_once __DIR__ . '/EzPublishKernel.php';
 
 use eZ\Bundle\EzPublishCoreBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
 
 $input = new ArgvInput();
-$env = $input->getParameterOption( array( '--env', '-e' ), getenv( 'SYMFONY_ENV' ) ?: 'dev' );
-$debug = getenv( 'SYMFONY_DEBUG' ) !== '0' && !$input->hasParameterOption( array( '--no-debug', '' ) ) && $env !== 'prod';
-if ( $debug )
-{
+$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+if ($debug) {
     Debug::enable();
 }
 
-$application = new Application( new EzPublishKernel( $env, $debug ) );
-$application->run( $input );
+$application = new Application(new EzPublishKernel($env, $debug));
+$application->run($input);