trivago / chapi

src/Service/JobValidator/PropertyValidator/Epsilon.php

Braces +4 added lines, -3 removed lines

@@ -57,9 +57,11 @@ 
                 $_oDateIntervalEpsilon = new \DateInterval($oJobEntity->epsilon);
                 $_iIntervalEpsilon = (int) $_oDateIntervalEpsilon->format('%Y%M%D%H%I%S');
 
-                if ($_iIntervalEpsilon > 30) // if epsilon > "PT30S"
+                if ($_iIntervalEpsilon > 30) {
+                    // if epsilon > "PT30S"
                 {
                     $_oIso8601Entity = $this->oDatePeriodFactory->createIso8601Entity($oJobEntity->schedule);
+                }
 
                     $_oDateIntervalScheduling = new \DateInterval($_oIso8601Entity->sInterval);
                     $_iIntervalScheduling = (int) $_oDateIntervalScheduling->format('%Y%M%D%H%I%S');
@@ -69,8 +71,7 @@ 
 
                 // if epsilon is less or equal than 30sec the not empty check is enough
                 return true;
-            }
-            catch (\Exception $_oException)
+            } catch (\Exception $_oException)
             {
                 // can't init \DateInterval instance
                 return false;

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     }
 
     /**
-     * @param JobEntity $oJobEntity
+     * @param JobEntityInterface $oJobEntity
      * @return bool
      */
     private function isEpsilonPropertyValid(JobEntityInterface $oJobEntity)

src/Service/JobValidator/PropertyValidator/Schedule.php

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
             {
                 $_oDataPeriod = $this->oDatePeriodFactory->createDatePeriod($oJobEntity->schedule, $oJobEntity->scheduleTimeZone);
                 return (false !== $_oDataPeriod);
-            }
-            catch (\Exception $oException)
+            } catch (\Exception $oException)
             {
                 // invalid: Iso8601 is not valid and/or DatePeriodFactory is able to create a valid DatePeriod
             }

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 
 
 use Chapi\Component\DatePeriod\DatePeriodFactoryInterface;
-use Chapi\Entity\Chronos\JobEntity;
 use Chapi\Entity\JobEntityInterface;
 use Chapi\Service\JobValidator\PropertyValidatorInterface;
 

src/BusinessCase/Comparison/ChronosJobComparisonBusinessCase.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
 
 
     /**
-     * @param JobRepositoryInterface $oJobRepositoryLocal
+     * @param JobRepositoryInterface $oJobRepositoryLocalChronos
      * @param JobRepositoryInterface $oJobRepositoryChronos
-     * @param JobRepositoryInterface $oJobRepositoryMarathon
+     * @param JobRepositoryInterface $oJobRepositoryLocalChronos
      * @param DiffCompareInterface $oDiffCompare
      * @param DatePeriodFactoryInterface $oDatePeriodFactory
      * @param LoggerInterface $oLogger

Unused Use Statements +1 added lines, -1 removed lines

@@ -11,8 +11,8 @@
 
 use Chapi\Component\Comparison\DiffCompareInterface;
 use Chapi\Component\DatePeriod\DatePeriodFactoryInterface;
-use Chapi\Entity\Chronos\JobCollection;
 use Chapi\Entity\Chronos\ChronosJobEntity;
+use Chapi\Entity\Chronos\JobCollection;
 use Chapi\Entity\JobEntityInterface;
 use Chapi\Service\JobRepository\JobRepositoryInterface;
 use Psr\Log\LoggerInterface;

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
      */
     public function getRemoteMissingJobs()
     {
-        $_ret =  $this->getMissingJobsInCollectionA(
+        $_ret = $this->getMissingJobsInCollectionA(
             $this->oJobRepositoryChronos->getJobs(),
             $this->oJobRepositoryLocalChronos->getJobs()
         );

Braces +1 added lines, -2 removed lines

@@ -317,8 +317,7 @@
         {
             $_oDateTime = new \DateTime(str_replace('Z', '', $_oIso8601Entity->sStartTime));
             $_oDateTime->setTimezone(new \DateTimeZone($sTimeZone));
-        }
-        else
+        } else
         {
             $_oDateTime = new \DateTime($_oIso8601Entity->sStartTime);
         }

src/BusinessCase/Comparison/MarathonJobComparisonBusinessCase.php

Unused Use Statements -2 removed lines

@@ -15,8 +15,6 @@
 use Chapi\Entity\Chronos\ChronosJobEntity;
 use Chapi\Entity\Chronos\JobCollection;
 use Chapi\Entity\JobEntityInterface;
-use Chapi\Entity\Marathon\AppEntity\FetchUrl;
-use Chapi\Entity\Marathon\AppEntity\PortDefinition;
 use Chapi\Entity\Marathon\MarathonAppEntity;
 use Chapi\Service\JobRepository\JobRepositoryInterface;
 

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
         $_aLocalJobs = $this->oLocalRepository->getJobs();
 
         /** @var JobEntityInterface $_oLocalJob */
-        foreach($_aLocalJobs as $_oLocalJob)
+        foreach ($_aLocalJobs as $_oLocalJob)
         {
             $_oRemoteJob = $this->oRemoteRepository->getJob($_oLocalJob->getKey());
             if (!$_oRemoteJob)
@@ -138,7 +138,7 @@ 
             $_aDifferences[$_sProperty] = $this->oDiffCompare->compare(
                 $_oRemoteJob->{$_sProperty},
                 $_oLocalJob->{$_sProperty}
-            ) ;
+            );
         }
 
         return $_aDifferences;

Braces +3 added lines, -6 removed lines

@@ -250,12 +250,10 @@ 
     {
         if (is_array($mValueA) && is_array($mValueB)) {
             return $this->isArrayEqual($mValueA, $mValueB);
-        }
-        elseif (is_object($mValueA) && is_object($mValueB))
+        } elseif (is_object($mValueA) && is_object($mValueB))
         {
             return $this->isArrayEqual(get_object_vars($mValueA), get_object_vars($mValueB));
-        }
-        elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB)))
+        } elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB)))
         {
             return $mValueA == $mValueB;
         }
@@ -288,8 +286,7 @@ 
                 {
                     return false;
                 }
-            }
-            else
+            } else
             {
                 foreach ($aValuesB as $_mValueB)
                 {

src/BusinessCase/JobManagement/MarathonStoreJobBusinessCase.php

Doc Comments +6 added lines

@@ -150,6 +150,9 @@ 
         return !(count($arr) == count(array_unique($arr)));
     }
 
+    /**
+     * @param integer $immediateChildren
+     */
     private function isDependencyCircular(JobEntityInterface $oEntity, $immediateChildren, &$path=[])
     {
         // Invariant: path will not have duplicates for acyclic dependency tree
@@ -310,6 +313,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $bForceOverwrite
+     */
     private function updateJobInLocalRepository($oAppRemote, $bForceOverwrite)
     {
         $_aDiff = $this->oJobComparisionBusinessCase->getJobDiff($oAppRemote->getKey());

Spacing +5 added lines, -5 removed lines

@@ -89,7 +89,7 @@ 
             $_oJobEntityLocal = $this->oJobRepositoryLocal->getJob($sAppId);
 
             // check if dependency is satisfied
-            if ( $_oJobEntityLocal->isDependencyJob())
+            if ($_oJobEntityLocal->isDependencyJob())
             {
                 try {
                     $circular = $this->isDependencyCircular($_oJobEntityLocal, count($_oJobEntityLocal->dependencies));
@@ -101,10 +101,10 @@ 
                         return false;
                     }
                 }
-                catch(\Exception $e)
+                catch (\Exception $e)
                 {
                     $this->oLogger->error(sprintf(
-                        "Job %s cannot be added to remote : %s",$sAppId, $e->getMessage()
+                        "Job %s cannot be added to remote : %s", $sAppId, $e->getMessage()
                     ));
                     return false;
                 }
@@ -150,7 +150,7 @@ 
         return !(count($arr) == count(array_unique($arr)));
     }
 
-    private function isDependencyCircular(JobEntityInterface $oEntity, $immediateChildren, &$path=[])
+    private function isDependencyCircular(JobEntityInterface $oEntity, $immediateChildren, &$path = [])
     {
         // Invariant: path will not have duplicates for acyclic dependency tree
         if ($this->hasDuplicates($path))
@@ -196,7 +196,7 @@ 
             // for B intermediate Child will be 2.
             // when we process D, it will be reduced to 1 and with C to 0
             // then we will pop B to generate path [A, E] when we reach E.
-            $immediateChildren = $immediateChildren -1;
+            $immediateChildren = $immediateChildren - 1;
             if ($immediateChildren == 0)
             {
                 array_pop($path);

Braces +7 added lines, -10 removed lines

@@ -100,8 +100,7 @@ 
                         ));
                         return false;
                     }
-                }
-                catch(\Exception $e)
+                } catch(\Exception $e)
                 {
                     $this->oLogger->error(sprintf(
                         "Job %s cannot be added to remote : %s",$sAppId, $e->getMessage()
@@ -268,8 +267,7 @@ 
         if (empty($aJobNames))
         {
             $_aApps = $this->oJobRepositoryRemote->getJobs();
-        }
-        else
+        } else
         {
             $_aApps = [];
             foreach ($aJobNames as $_sAppName)
@@ -282,11 +280,12 @@ 
         foreach ($_aApps as $_oAppRemote)
         {
             $_oAppLocal = $this->oJobRepositoryLocal->getJob($_oAppRemote->getKey());
-            if (null == $_oAppLocal) // add
+            if (null == $_oAppLocal) {
+                // add
             {
                 $this->addJobInLocalRepository($_oAppRemote);
             }
-            else // update
+            } else // update
             {
                 $this->updateJobInLocalRepository($_oAppRemote, $bForceOverwrite);
             }
@@ -301,8 +300,7 @@ 
                 'App %s stored in local repository',
                 $oAppRemote->getKey()
             ));
-        }
-        else {
+        } else {
             $this->oLogger->error(sprintf(
                 'Failed to store %s in local repository',
                 $oAppRemote->getKey()
@@ -331,8 +329,7 @@ 
                     'App %s is updated in local repository',
                     $oAppRemote->getKey()
                 ));
-            }
-            else {
+            } else {
                 $this->oLogger->error(sprintf(
                     'Failed to update app %s in local repository',
                     $oAppRemote->getKey()

src/BusinessCase/JobManagement/StoreJobBusinessCaseFactoryInterface.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     /**
      * @param StoreJobBusinessCaseInterface $oStoreJob
      * @return
-     */
+     void
     public function addBusinesCase(StoreJobBusinessCaseInterface $oStoreJob);
 
     /**

src/Component/RemoteClients/ChronosApiClient.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -11,8 +11,8 @@
 namespace Chapi\Component\RemoteClients;
 
 
-use Chapi\Component\RemoteClients\ApiClientInterface;
 use Chapi\Component\Http\HttpClientInterface;
+use Chapi\Component\RemoteClients\ApiClientInterface;
 use Chapi\Entity\Chronos\ChronosJobEntity;
 use Chapi\Entity\JobEntityInterface;
 use Chapi\Exception\ApiClientException;

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
      */
     public function removeJob($sJobName)
     {
-        $_oResponse = $this->oHttpClient->delete('/scheduler/job/' . $sJobName);
+        $_oResponse = $this->oHttpClient->delete('/scheduler/job/'.$sJobName);
         return ($_oResponse->getStatusCode() == 204);
     }
 
@@ -91,7 +91,7 @@ 
      */
     public function getJobStats($sJobName)
     {
-        return $this->sendGetJsonRequest('/scheduler/job/stat/' . $sJobName);
+        return $this->sendGetJsonRequest('/scheduler/job/stat/'.$sJobName);
     }
 
     /**

src/Entity/Marathon/AppSubEntityFactory.php

Unused Use Statements -2 removed lines

@@ -9,13 +9,11 @@
 
 namespace Chapi\Entity\Marathon;
 
-use Chapi\Entity\Marathon\AppEntity;
 use Chapi\Entity\Marathon\AppEntity\Container;
 use Chapi\Entity\Marathon\AppEntity\FetchUrl;
 use Chapi\Entity\Marathon\AppEntity\HealthCheck;
 use Chapi\Entity\Marathon\AppEntity\PortDefinition;
 use Chapi\Entity\Marathon\AppEntity\UpgradeStrategy;
-use SebastianBergmann\Comparator\ExceptionComparatorTest;
 
 class AppSubEntityFactory implements AppSubEntityFactoryInterface
 {

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         if (is_array($mData))
         {
             $ret = [];
-            foreach($mData as $data)
+            foreach ($mData as $data)
             {
                 $ret[] = new self::$sSubEntityMap[$sName]($data);
             }

src/Service/JobRepository/BridgeFileSystem.php

Doc Comments +3 added lines

@@ -347,6 +347,9 @@
     }
 
 
+    /**
+     * @param string $sJobFile
+     */
     private function dumpFileWithGroup($sJobFile, JobEntityInterface $oJobEntity, $bAdd = true)
     {
         $_sGroupConfig = file_get_contents($sJobFile);

Spacing +2 added lines, -2 removed lines

@@ -161,7 +161,7 @@ 
             $_sJobPath = $oJobEntity->getKey();
         }
 
-        return $this->sRepositoryDir . DIRECTORY_SEPARATOR . $_sJobPath . '.json';
+        return $this->sRepositoryDir.DIRECTORY_SEPARATOR.$_sJobPath.'.json';
     }
 
     /**
@@ -176,7 +176,7 @@ 
             throw new \RuntimeException(sprintf('Path "%s" is not valid', $sPath));
         }
 
-        $_aTemp = Glob::glob(rtrim($sPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
+        $_aTemp = Glob::glob(rtrim($sPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*');
 
         foreach ($_aTemp as $_sPath)
         {

Braces +9 added lines, -8 removed lines

@@ -155,8 +155,7 @@ 
                 DIRECTORY_SEPARATOR,
                 $oJobEntity->getKey()
             );
-        }
-        else
+        } else
         {
             $_sJobPath = $oJobEntity->getKey();
         }
@@ -268,15 +267,19 @@ 
 
             if ($_aTemp)
             {
-                if (property_exists($_aTemp, "name")) // chronos
+                if (property_exists($_aTemp, "name")) {
+                    // chronos
                 {
                     $_aJobEntities[] = new ChronosJobEntity($_aTemp);
+                }
 
-                } else if (property_exists($_aTemp, "id")) //marathon
+                } else if (property_exists($_aTemp, "id")) {
+                    //marathon
                 {
                     foreach ($this->getMarathonEntitiesForConfig($_aTemp) as $_oApp)
                     {
                         $_aJobEntities[] = $_oApp;
+                }
                     }
                 } else {
                     throw new JobLoadException(
@@ -297,8 +300,7 @@ 
                     $_aJobs[] = $_oJobEntity;
                 }
 
-            }
-            else
+            } else
             {
                 throw new JobLoadException(
                     sprintf('Unable to load json job data from "%s". Please check if the json is valid.', $_sJobFilePath),
@@ -323,8 +325,7 @@ 
                 $this->aGroupedApps[] = $_oApp->id;
                 $_aRet[] = $_oGroupEntity;
             }
-        }
-        else
+        } else
         {
             $_aRet[] = new MarathonAppEntity($aEntityData);
         }