Merge remote-tracking branch 'upstream/master'

ezpublishlegacy · Feb 25, 2015 · 84738ab · 84738ab
2 parents eb65b6d + f70b84f
commit 84738ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Tests/FieldType/BaseIntegrationTest.php b/Tests/FieldType/BaseIntegrationTest.php
@@ -587,6 +587,7 @@ protected function getContainer()
         $loader->load( 'repository.yml' );
         $loader->load( 'fieldtype_external_storages.yml' );
         $loader->load( 'storage_engines/common.yml' );
+        $loader->load( 'storage_engines/shortcuts.yml' );
         $loader->load( 'storage_engines/legacy.yml' );
         $loader->load( 'search_engines/legacy.yml' );
         $loader->load( 'storage_engines/cache.yml' );

diff --git a/Tests/FieldType/FileBaseIntegrationTest.php b/Tests/FieldType/FileBaseIntegrationTest.php
@@ -150,6 +150,7 @@ protected function getContainer()
         $loader->load( 'repository.yml' );
         $loader->load( 'fieldtype_external_storages.yml' );
         $loader->load( 'storage_engines/common.yml' );
+        $loader->load( 'storage_engines/shortcuts.yml' );
         $loader->load( 'storage_engines/legacy.yml' );
         $loader->load( 'search_engines/legacy.yml' );
         $loader->load( 'storage_engines/cache.yml' );