Merge pull request #3 from olegpro/bitrixmigration-improvement

arrilot · web-flow · commit b7fed4131a1e · 2017-01-23T20:21:10.000+03:00
Improved method getIblockIdByCode class BitrixMigration
diff --git a/src/BaseMigrations/BitrixMigration.php b/src/BaseMigrations/BitrixMigration.php
@@ -51,12 +51,13 @@ public function down()
      * Find iblock id by its code.
      *
      * @param string $code
+     * @param null|string $iBlockType
      *
      * @throws MigrationException
      *
      * @return int
      */
-    protected function getIblockIdByCode($code)
+    protected function getIblockIdByCode($code, $iBlockType = null)
     {
         if (!$code) {
             throw new MigrationException('Не задан код инфоблока');
@@ -67,6 +68,10 @@ protected function getIblockIdByCode($code)
             'CHECK_PERMISSIONS' => 'N',
         ];
 
+        if ($iBlockType !== null) {
+            $filter['TYPE'] = $iBlockType;
+        }
+
         $iblock = (new CIBlock())->GetList([], $filter)->fetch();
 
         if (!$iblock['ID']) {

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,13 @@ public function down()`
`51`	`51`	`* Find iblock id by its code.`
`52`	`52`	`*`
`53`	`53`	`* @param string $code`
	`54`	`+ * @param null\|string $iBlockType`
`54`	`55`	`*`
`55`	`56`	`* @throws MigrationException`
`56`	`57`	`*`
`57`	`58`	`* @return int`
`58`	`59`	`*/`
`59`		`- protected function getIblockIdByCode($code)`
	`60`	`+ protected function getIblockIdByCode($code, $iBlockType = null)`
`60`	`61`	`{`
`61`	`62`	`if (!$code) {`
`62`	`63`	`throw new MigrationException('Не задан код инфоблока');`
`@@ -67,6 +68,10 @@ protected function getIblockIdByCode($code)`
`67`	`68`	`'CHECK_PERMISSIONS' => 'N',`
`68`	`69`	`];`
`69`	`70`
	`71`	`+ if ($iBlockType !== null) {`
	`72`	`+ $filter['TYPE'] = $iBlockType;`
	`73`	`+ }`
	`74`	`+`
`70`	`75`	`$iblock = (new CIBlock())->GetList([], $filter)->fetch();`
`71`	`76`
`72`	`77`	`if (!$iblock['ID']) {`