Refs #7112, shortening constructor logic for DuplicateActionRemover &…

… FixDuplicateActions.
matomo-org · Feb 9, 2015 · 6ef32c1 · 6ef32c1
1 parent e084b06
commit 6ef32c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/plugins/CoreAdminHome/Commands/FixDuplicateLogActions.php b/plugins/CoreAdminHome/Commands/FixDuplicateLogActions.php
@@ -75,25 +75,10 @@ public function __construct(ArchiveInvalidator $invalidator = null, DuplicateAct
     {
         parent::__construct();
 
-        if ($invalidator === null) {
-            $invalidator = new ArchiveInvalidator();
-        }
-        $this->archiveInvalidator = $invalidator;
-
-        if ($duplicateActionRemover === null) {
-            $duplicateActionRemover = new DuplicateActionRemover();
-        }
-        $this->duplicateActionRemover = $duplicateActionRemover;
-
-        if ($actionsAccess === null) {
-            $actionsAccess = new Actions();
-        }
-        $this->actionsAccess = $actionsAccess;
-
-        if ($logger === null) {
-            $logger = StaticContainer::get('Psr\Log\LoggerInterface');
-        }
-        $this->logger = $logger;
+        $this->archiveInvalidator = $invalidator ?: new ArchiveInvalidator();
+        $this->duplicateActionRemover = $duplicateActionRemover ?: new DuplicateActionRemover();
+        $this->actionsAccess = $actionsAccess ?: new Actions();
+        $this->logger = $logger ?: StaticContainer::get('Psr\Log\LoggerInterface');
     }
 
     protected function configure()

diff --git a/plugins/CoreAdminHome/Model/DuplicateActionRemover.php b/plugins/CoreAdminHome/Model/DuplicateActionRemover.php
@@ -58,15 +58,8 @@ class DuplicateActionRemover
      */
     public function __construct($tableMetadataAccess = null, $logger = null)
     {
-        if ($tableMetadataAccess === null) {
-            $tableMetadataAccess = new TableMetadata();
-        }
-        $this->tableMetadataAccess = $tableMetadataAccess;
-
-        if ($logger === null) {
-            $logger = StaticContainer::get('Psr\Log\LoggerInterface');
-        }
-        $this->logger = $logger;
+        $this->tableMetadataAccess = $tableMetadataAccess ?: new TableMetadata();
+        $this->logger = $logger ?: StaticContainer::get('Psr\Log\LoggerInterface');
     }
 
     /**