oro-subtree
diff --git a/‎Cache/CacheWarmerAggregate.php
Lines changed: 2 additions & 1 deletion b/‎Cache/CacheWarmerAggregate.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎OroEntityExtendBundle.php
Lines changed: 8 additions & 2 deletions b/‎OroEntityExtendBundle.php
Lines changed: 8 additions & 2 deletions
diff --git a/‎README.md
Lines changed: 7 additions & 7 deletions b/‎README.md
Lines changed: 7 additions & 7 deletions
diff --git a/‎Resources/config/oro/entity_config.yml
Lines changed: 1 addition & 1 deletion b/‎Resources/config/oro/entity_config.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎Resources/doc/associations.md
Lines changed: 1 addition & 1 deletion b/‎Resources/doc/associations.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎Resources/doc/relations.md
Lines changed: 10 additions & 10 deletions b/‎Resources/doc/relations.md
Lines changed: 10 additions & 10 deletions
@@ -41,7 +41,8 @@ public function isOptional()
      */
     public function warmUp($cacheDir)
     {
-        if (CommandExecutor::isCurrentCommand('oro:entity-extend:cache:', true)) {
+        if (CommandExecutor::isCurrentCommand('oro:entity-extend:cache:', true)
+            || CommandExecutor::isCurrentCommand('oro:platform:upgrade20', true)) {
             foreach ($this->warmers as $warmer) {
                 $warmer->warmUp($cacheDir);
             }
 
@@ -87,7 +87,8 @@ public function build(ContainerBuilder $container)
 
     private function ensureInitialized()
     {
-        if (!CommandExecutor::isCurrentCommand('oro:entity-extend:cache:', true)) {
+        if (!CommandExecutor::isCurrentCommand('oro:entity-extend:cache:', true)
+            && !CommandExecutor::isCurrentCommand('oro:platform:upgrade20', true)) {
             ExtendClassLoadingUtils::ensureDirExists(ExtendClassLoadingUtils::getEntityCacheDir($this->cacheDir));
             if (!file_exists(ExtendClassLoadingUtils::getAliasesPath($this->cacheDir))) {
                 $this->checkConfigs();
@@ -122,7 +123,12 @@ private function checkConfigs()
                 $process = $pb->getProcess();
                 $exitStatusCode = $process->run();
                 if ($exitStatusCode) {
-                    throw new \RuntimeException($process->getErrorOutput());
+                    $output = $process->getErrorOutput();
+
+                    if (empty($output)) {
+                        $output = $process->getOutput();
+                    }
+                    throw new \RuntimeException($output);
                 }
 
                 return;
 
@@ -26,15 +26,15 @@ The existing entity can be extended using migration scripts. To create new exten
 ``` php
 <?php
 
-namespace OroCRM\Bundle\AccountBundle\Migrations\Schema\v1_0;
+namespace Oro\Bundle\AccountBundle\Migrations\Schema\v1_0;
 
 use Doctrine\DBAL\Schema\Schema;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 use Oro\Bundle\EntityBundle\EntityConfig\DatagridScope;
 use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 
-class OroCRMAccountBundle implements Migration
+class OroAccountBundle implements Migration
 {
     public function up(Schema $schema, QueryBag $queries)
     {
@@ -91,7 +91,7 @@ Creating relations is more complex task than creation of regular field. Oro Plat
 ``` php
 <?php
 
-namespace OroCRM\Bundle\SalesBundle\Migrations\Schema\v1_0;
+namespace Oro\Bundle\SalesBundle\Migrations\Schema\v1_0;
 
 use Doctrine\DBAL\Schema\Schema;
 use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtension;
@@ -100,7 +100,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -140,7 +140,7 @@ The option sets are quite complex types, but to understand how they work you nee
 ``` php
 <?php
 
-namespace OroCRM\Bundle\SalesBundle\Migrations\Schema\v1_0;
+namespace Oro\Bundle\SalesBundle\Migrations\Schema\v1_0;
 
 use Doctrine\DBAL\Schema\Schema;
 use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtension;
@@ -149,7 +149,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -185,7 +185,7 @@ To load a list of options you can use data fixtures, for example:
 
 <?php
 
-namespace OroCRM\Bundle\DemoDataBundle\Migrations\Data\Demo\ORM;
+namespace Oro\Bundle\DemoDataBundle\Migrations\Data\Demo\ORM;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -133,7 +133,7 @@ entity_config:
                 # 'activity' => [
                 #     'activities' => [
                 #         ['Oro\Bundle\EmailBundle\Entity\Email'],
-                #         ['OroCRM\Bundle\TaskBundle\Entity\Task'],
+                #         ['Oro\Bundle\TaskBundle\Entity\Task'],
                 #     ],
                 # ],
                 #
 
@@ -31,7 +31,7 @@ Let's consider an example when you have an Email entity which can be owned eithe
 	    } elseif ($owner instanceof Oro\Bundle\UserBundle\Entity\User) {
 	        $this->contact = null;
 	        $this->user = $owner;
-	    } elseif ($owner instanceof OroCRM\Bundle\ContactBundle\Entity\Contact) {
+	    } elseif ($owner instanceof Oro\Bundle\ContactBundle\Entity\Contact) {
 	        $this->user = null;
 	        $this->contact = $owner;
 	    } else {
 
@@ -18,7 +18,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -56,7 +56,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -105,7 +105,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -145,7 +145,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -185,7 +185,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -236,7 +236,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -287,7 +287,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -327,7 +327,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -367,7 +367,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
 
@@ -416,7 +416,7 @@ use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
+class OroSalesBundle implements Migration, ExtendExtensionAwareInterface
 {
     protected $extendExtension;
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ public function isOptional()`
`41`	`41`	`*/`
`42`	`42`	`public function warmUp($cacheDir)`
`43`	`43`	`{`
`44`		`- if (CommandExecutor::isCurrentCommand('oro:entity-extend:cache:', true)) {`
	`44`	`+ if (CommandExecutor::isCurrentCommand('oro:entity-extend:cache:', true)`
	`45`	`+ \|\| CommandExecutor::isCurrentCommand('oro:platform:upgrade20', true)) {`
`45`	`46`	`foreach ($this->warmers as $warmer) {`
`46`	`47`	`$warmer->warmUp($cacheDir);`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ entity_config:`
`133`	`133`	`# 'activity' => [`
`134`	`134`	`# 'activities' => [`
`135`	`135`	`# ['Oro\Bundle\EmailBundle\Entity\Email'],`
`136`		`- # ['OroCRM\Bundle\TaskBundle\Entity\Task'],`
	`136`	`+ # ['Oro\Bundle\TaskBundle\Entity\Task'],`
`137`	`137`	`# ],`
`138`	`138`	`# ],`
`139`	`139`	`#`