PHP CS Fixer (2)

packages/migration_tool/controller.php

@@ -73,11 +73,11 @@ public function uninstall()
         $db = \Database::connection();
         $db->Execute('SET foreign_key_checks = 0');
         $tables = $db->GetCol("show tables like 'MigrationImport%'");
-        foreach($tables as $table) {
+        foreach ($tables as $table) {
             $db->Execute('drop table ' . $table);
         }
         $tables = $db->GetCol("show tables like 'MigrationExport%'");
-        foreach($tables as $table) {
+        foreach ($tables as $table) {
             $db->Execute('drop table ' . $table);
         }
         $db->Execute('SET foreign_key_checks = 1');
@@ -122,9 +122,8 @@ protected function installSinglePages($pkg)
 
     public function on_start()
     {
-
         require $this->getPackagePath() . '/helpers.php';
-        
+
         \Core::bind('migration/batch/page/validator', function ($app, $batch) {
             if (isset($batch[0])) {
                 $v = new Validator($batch[0]);

packages/migration_tool/controllers/single_page/dashboard/system/migration/export.php

@@ -98,7 +98,7 @@ public function export_batch_xml($id = null)
             } else {
                 header('Content-type: text/xml');
             }
-            print $exporter->getElement()->asXML();
+            echo $exporter->getElement()->asXML();
             exit;
         } else {
             $this->view();
@@ -216,7 +216,7 @@ public function add_to_batch($id = null)
                 }
             }
             $drivers = $exporters->getDrivers();
-            usort($drivers, function($a, $b) {
+            usort($drivers, function ($a, $b) {
                 return strcasecmp($a->getPluralDisplayName(), $b->getPluralDisplayName());
             });
             $this->set('drivers', $drivers);

packages/migration_tool/controllers/single_page/dashboard/system/migration/import.php

@@ -11,11 +11,8 @@
 use PortlandLabs\Concrete5\MigrationTool\Batch\Processor\PublisherRoutineProcessor;
 use PortlandLabs\Concrete5\MigrationTool\Batch\Processor\Target;
 use PortlandLabs\Concrete5\MigrationTool\Batch\Processor\TargetItemProcessor;
-use PortlandLabs\Concrete5\MigrationTool\Batch\Processor\Task\MapContentTypesTask;
 use PortlandLabs\Concrete5\MigrationTool\Batch\Processor\Task\NormalizePagePathsTask;
-use PortlandLabs\Concrete5\MigrationTool\Batch\Processor\Task\TransformContentTypesTask;
 use PortlandLabs\Concrete5\MigrationTool\Batch\Processor\UntransformedItemProcessor;
-use PortlandLabs\Concrete5\MigrationTool\Publisher\Publisher;
 use PortlandLabs\Concrete5\MigrationTool\Entity\Import\Batch;
 use PortlandLabs\Concrete5\MigrationTool\Importer\FileParser as Parser;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -156,14 +153,12 @@ public function add_content_to_batch()
             $this->entityManager->flush();
 
             return new JsonResponse($batch);
-
         } else {
             return $this->app->make('helper/ajax')->sendError($this->error);
         }
         $this->app->shutdown();
     }
 
-
     public function run_batch_content_normalize_page_paths_task()
     {
         if (!$this->token->validate('run_batch_content_normalize_page_paths_task')) {
@@ -180,6 +175,7 @@ public function run_batch_content_normalize_page_paths_task()
             $processor->registerTask(new NormalizePagePathsTask());
             $processor->process();
             $this->entityManager->flush();
+
             return new JsonResponse($batch);
         }
         $this->view();
@@ -216,6 +212,7 @@ public function run_batch_content_map_content_types_task()
             $response = ob_get_contents();
             ob_end_clean();
             $response = new \Concrete\Core\Http\Response($response);
+
             return $response;
         }
         $this->view();
@@ -252,12 +249,12 @@ public function run_batch_content_transform_content_types_task()
             $response = ob_get_contents();
             ob_end_clean();
             $response = new \Concrete\Core\Http\Response($response);
+
             return $response;
         }
         $this->view();
     }
 
-
     public function create_content_from_batch()
     {
         if (!$this->token->validate('create_content_from_batch')) {
@@ -289,6 +286,7 @@ public function create_content_from_batch()
             $response = ob_get_contents();
             ob_end_clean();
             $response = new \Concrete\Core\Http\Response($response);
+
             return $response;
         }
         $this->view();
@@ -302,7 +300,6 @@ protected function clearQueues()
         $queue->deleteQueue();
         $queue = \Concrete\Core\Foundation\Queue\Queue::get('target_item_processor');
         $queue->deleteQueue();
-
     }
 
     public function view()
@@ -370,7 +367,7 @@ public function upload_files()
                         $response = $ih->import($_FILES['file']['tmp_name'], $_FILES['file']['name']);
                         if (!($response instanceof \Concrete\Core\File\Version) && !compat_is_version_8()) {
                             throw new \Exception(Importer::getErrorMessage($response));
-                        } else if (!($response instanceof \Concrete\Core\Entity\File\Version) && compat_is_version_8()) {
+                        } elseif (!($response instanceof \Concrete\Core\Entity\File\Version) && compat_is_version_8()) {
                             throw new \Exception(Importer::getErrorMessage($response));
                         } else {
                             $file = $response->getFile();
@@ -413,7 +410,7 @@ public function save_mapping()
 
         $mappers = \Core::make('migration/manager/mapping');
         /**
-         * @var $mappers MapperManagerInterface
+         * @var MapperManagerInterface
          */
         $mapper = $mappers->driver($this->request->request->get('mapper'));
         if (!is_object($mapper)) {

packages/migration_tool/elements/batch.php

@@ -53,18 +53,20 @@
     <div class="ccm-tab-content" id="ccm-tab-content-batch-content">
 
         <?php foreach ($batch->getObjectCollections() as $collection) {
-            if ($collection->hasRecords()) {
-                $formatter = $collection->getFormatter();
-                ?>
+    if ($collection->hasRecords()) {
+        $formatter = $collection->getFormatter();
+        ?>
 
                 <h3><?=$formatter->getPluralDisplayName()?></h3>
-                <?php print $formatter->displayObjectCollection()?>
+                <?php echo $formatter->displayObjectCollection()?>
                 <?php
-            }
-            ?>
+
+    }
+    ?>
             <?php
-        }
-        ?>
+
+}
+    ?>
 
     </div>
 
@@ -80,6 +82,7 @@
     ?>
     <p><?=t('This content batch is empty.')?></p>
     <?php
+
 }
 ?>
 

packages/migration_tool/elements/batch_content_types/group.php

@@ -16,6 +16,7 @@
         <td><?=$group->getName()?></td>
         <td><?=$group->getPath()?></td>
     <?php
+
 } ?>
     </tbody>
 </table>

packages/migration_tool/helpers.php

@@ -1,7 +1,10 @@
-<?php defined('C5_EXECUTE') or die("Access Denied.");
+<?php
+
+defined('C5_EXECUTE') or die("Access Denied.");
 
 if (!function_exists('compat_is_version_8')) {
-    function compat_is_version_8() {
+    function compat_is_version_8()
+    {
         return interface_exists('\Concrete\Core\Export\ExportableInterface');
     }
-}
+}

packages/migration_tool/single_pages/dashboard/system/migration/add_to_export_batch.php

@@ -70,7 +70,7 @@
         </div>
 
 
-        <?php print $formatter->displaySearchResults();
+        <?php echo $formatter->displaySearchResults();
     ?>
 
     <?php 

packages/migration_tool/single_pages/dashboard/system/migration/batch_files.php

@@ -1,6 +1,6 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
 $dh = Core::make('helper/date');
-/** @var \Concrete\Core\Localization\Service\Date $dh */
+/* @var \Concrete\Core\Localization\Service\Date $dh */
 ?>
 <div class="ccm-dashboard-header-buttons btn-group">
     <a href="<?=$view->action('view_batch', $batch->getID())?>" class="btn btn-default"><i class="fa fa-angle-double-left"></i> <?=t('Back to Batch')?></a>

packages/migration_tool/single_pages/dashboard/system/migration/export.php

@@ -1 +1,3 @@
-<?php defined('C5_EXECUTE') or die("Access Denied.");
+<?php
+
+defined('C5_EXECUTE') or die("Access Denied.");

packages/migration_tool/single_pages/dashboard/system/migration/find_and_replace.php

@@ -1,6 +1,6 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
 $dh = Core::make('helper/date');
-/** @var \Concrete\Core\Localization\Service\Date $dh */
+/* @var \Concrete\Core\Localization\Service\Date $dh */
 
 ?>
     <div class="ccm-dashboard-header-buttons">

packages/migration_tool/single_pages/dashboard/system/migration/import.php

@@ -1 +1,3 @@
-<?php defined('C5_EXECUTE') or die("Access Denied.");
+<?php
+
+defined('C5_EXECUTE') or die("Access Denied.");

packages/migration_tool/single_pages/dashboard/system/migration/map_content.php

@@ -1,6 +1,6 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
 $dh = Core::make('helper/date');
-/** @var \Concrete\Core\Localization\Service\Date $dh */
+/* @var \Concrete\Core\Localization\Service\Date $dh */
 ?>
 <div class="ccm-dashboard-header-buttons">
     <a href="<?=$view->action('view_batch', $batch->getID())?>" class="btn btn-default"><i class="fa fa-angle-double-left"></i> <?=t('Back to Batch')?></a>
@@ -46,18 +46,20 @@
     ?>
 
         <?php if (count($targetItemList->getMapperCorePropertyTargetItems())) {
-            ?>
+    ?>
             <optgroup label="** <?=t('Installed %s', $mapper->getMappedItemPluralName())?>"></optgroup>
             <?php foreach ($targetItemList->getMapperCorePropertyTargetItems() as $targetItem) {
-                ?>
+    ?>
                 <option <?php if (is_object($selectedTargetItem) && $selectedTargetItem->matches($targetItem)) {
-                        ?>selected="selected" <?php
-                }
-                ?> value="<?=$targetItem->getItemID()?>"><?=$targetItem->getItemName()?></option>
+    ?>selected="selected" <?php
+
+}
+    ?> value="<?=$targetItem->getItemID()?>"><?=$targetItem->getItemName()?></option>
                 <?php
-            }
-        }
-            ?>
+
+}
+}
+    ?>
 
 
             <?php if (count($targetItemList->getMapperInstalledTargetItems())) {

packages/migration_tool/single_pages/dashboard/system/migration/view.php

@@ -1 +1,3 @@
-<?php defined('C5_EXECUTE') or die("Access Denied.");
+<?php
+
+defined('C5_EXECUTE') or die("Access Denied.");

packages/migration_tool/single_pages/dashboard/system/migration/view_batch.php

@@ -1,6 +1,6 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
 $dh = Core::make('helper/date');
-/** @var \Concrete\Core\Localization\Service\Date $dh */
+/* @var \Concrete\Core\Localization\Service\Date $dh */
 ?>
 <div class="ccm-dashboard-header-buttons">
 <div class="btn-group" role="group" aria-label="...">
@@ -17,6 +17,7 @@
     ?>
                 <li><a href="<?=$view->action('map_content', $batch->getId(), $mapper->getHandle())?>"><?=$mapper->getMappedItemPluralName()?></a></li>
             <?php
+
 } ?>
             <?php /*
             <li><a href="<?=$view->action('find_and_replace', $batch->getID())?>"><?=t("Find and Replace")?></a></li>
@@ -135,15 +136,19 @@
     <h2><?=t('Batch')?>
         <small><?=$dh->formatDateTime($batch->getDate(), true)?></small></h2>
 
-    <?php if ($batch->getNotes()) { ?>
+    <?php if ($batch->getNotes()) {
+    ?>
         <p><?=$batch->getNotes()?></p>
     <?php
-        }
+
+}
     ?>
 
-    <?php Loader::element('batch', array('batch' => $batch), 'migration_tool'); ?>
+    <?php Loader::element('batch', array('batch' => $batch), 'migration_tool');
+    ?>
 
-<?php } ?>
+<?php 
+} ?>
 
 
 <script type="text/javascript">

packages/migration_tool/single_pages/dashboard/system/migration/view_batches.php

@@ -1,6 +1,6 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
 $dh = Core::make('helper/date');
-/** @var \Concrete\Core\Localization\Service\Date $dh */
+/* @var \Concrete\Core\Localization\Service\Date $dh */
 ?>
 
 <div class="ccm-dashboard-header-buttons">

packages/migration_tool/single_pages/dashboard/system/migration/view_export_batch.php

@@ -1,6 +1,6 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
 $dh = Core::make('helper/date');
-/** @var \Concrete\Core\Localization\Service\Date $dh */
+/* @var \Concrete\Core\Localization\Service\Date $dh */
 ?>
 <div class="ccm-dashboard-header-buttons">
 <div class="btn-group" role="group">
@@ -56,7 +56,7 @@
         ?>
 
                     <h3><?=$itemType->getPluralDisplayName()?></h3>
-                    <?php print $formatter->displayBatchResults()?>
+                    <?php echo $formatter->displayBatchResults()?>
                 <?php 
     }
     ?>

packages/migration_tool/src/PortlandLabs/Concrete5/MigrationTool/Batch/BatchInterface.php

@@ -3,8 +3,6 @@
 
 interface BatchInterface
 {
-
-    function getObjectCollections();
-    function getObjectCollection($collection);
-
+    public function getObjectCollections();
+    public function getObjectCollection($collection);
 }

packages/migration_tool/src/PortlandLabs/Concrete5/MigrationTool/Batch/ContentMapper/EmptyMapper.php

@@ -8,7 +8,6 @@
 
 class EmptyMapper implements MapperInterface, TransformableEntityMapperInterface
 {
-
     public function getMappedItemPluralName()
     {
         return t('Empty');

packages/migration_tool/src/PortlandLabs/Concrete5/MigrationTool/Batch/ContentMapper/Manager.php

@@ -16,7 +16,6 @@
 
 class Manager extends CoreManager implements MapperManagerInterface
 {
-
     public function createTargetItemList(BatchInterface $batch, MapperInterface $mapper)
     {
         return new TargetItemList($batch, $mapper);

packages/migration_tool/src/PortlandLabs/Concrete5/MigrationTool/Batch/ContentMapper/MapperManagerInterface.php

@@ -7,6 +7,6 @@
 
 interface MapperManagerInterface
 {
-    function createTargetItemList(BatchInterface $batch, MapperInterface $mapper);
-    function createBatchTargetItem();
+    public function createTargetItemList(BatchInterface $batch, MapperInterface $mapper);
+    public function createBatchTargetItem();
 }

packages/migration_tool/src/PortlandLabs/Concrete5/MigrationTool/Batch/ContentMapper/TargetItemList.php

@@ -22,7 +22,6 @@ public function __construct(BatchInterface $batch, MapperInterface $mapper)
         $this->repository = 'PortlandLabs\Concrete5\MigrationTool\Entity\Import\BatchTargetItem';
     }
 
-
     public function getMapperCorePropertyTargetItems()
     {
         return $this->mapper->getCorePropertyTargetItems($this->batch);
@@ -33,7 +32,6 @@ public function getMapperInstalledTargetItems()
         return $this->mapper->getInstalledTargetItems($this->batch);
     }
 
-
     public function getMapperBatchTargetItems()
     {
         return $this->mapper->getBatchTargetItems($this->batch);