trivago / chapi

src/Commands/StatusCommand.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
                 {
                     $_aFilteredJobList[] = $_sJobName;
                 }
-            }
-            else
+            } else
             {
                 if (!$this->oJobIndexService->isJobInIndex($_sJobName))
                 {

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);
         }

src/Service/JobValidator/PropertyValidator/AbstractPropertyValidator.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 namespace Chapi\Service\JobValidator\PropertyValidator;
 
 
-use Chapi\Entity\Chronos\JobEntity;
 use Chapi\Entity\JobEntityInterface;
 use Chapi\Service\JobValidator\PropertyValidatorInterface;
 

src/Entity/Marathon/MarathonEntityUtils.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public static function setAllPossibleProperties($oData, $oTarget)
     {
-        foreach($oData as $attrName => $attrValue)
+        foreach ($oData as $attrName => $attrValue)
         {
             // dont set array or objects.
             // Because this would need further type information to properly set.

src/BusinessCase/Comparison/ChronosJobComparisonBusinessCase.php

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);
         }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
     }
 
 
-    protected function preCompareModifications(JobEntityInterface &$oLocalJob, JobEntityInterface &$oRemoteJob)
+    protected function preCompareModifications(JobEntityInterface & $oLocalJob, JobEntityInterface & $oRemoteJob)
     {
         // no modification needed
         return;

src/Service/JobRepository/JobRepository.php

Braces +3 added lines, -1 removed lines

@@ -99,10 +99,12 @@
     {
         if ($this->oRepositoryBridge->addJob($oJobEntity))
         {
-            if (!is_null($this->oJobCollection)) // if no collection inited the new job will init by chronos request
+            if (!is_null($this->oJobCollection)) {
+                // if no collection inited the new job will init by chronos request
             {
                 $this->oJobCollection->offsetSet($oJobEntity->getKey(), $oJobEntity);
             }
+            }
 
             return true;
         }

src/Commands/InfoCommand.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
                 $_mValue = (!empty($_mValue))
                     ? json_encode($_mValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
                     : $_sEmptyString;
-            }
-            elseif (is_bool($_mValue))
+            } elseif (is_bool($_mValue))
             {
                 $_mValue = (true === $_mValue)
                     ? 'true'

src/BusinessCase/JobManagement/MarathonStoreJobBusinessCase.php

Doc Comments +3 added lines

@@ -133,6 +133,9 @@
         return !(count($arr) == count(array_unique($arr)));
     }
 
+    /**
+     * @param integer $iImmediateChildren
+     */
     private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path=[])
     {
         // Invariant: path will not have duplicates for acyclic dependency tree

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 
 
 use Chapi\BusinessCase\Comparison\JobComparisonInterface;
-use Chapi\Entity\JobEntityInterface;
 use Chapi\Entity\Marathon\MarathonAppEntity;
 use Chapi\Service\JobIndex\JobIndexServiceInterface;
 use Chapi\Service\JobRepository\JobRepositoryInterface;

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
             }
 
             // check if dependency is satisfied
-            if ( $_oJobEntityLocal->isDependencyJob())
+            if ($_oJobEntityLocal->isDependencyJob())
             {
                 try {
                     $circular = $this->isDependencyCircular($_oJobEntityLocal, count($_oJobEntityLocal->dependencies));
@@ -84,10 +84,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;
                 }
@@ -133,7 +133,7 @@ 
         return !(count($arr) == count(array_unique($arr)));
     }
 
-    private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path=[])
+    private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path = [])
     {
         // Invariant: path will not have duplicates for acyclic dependency tree
         if ($this->hasDuplicates($path))
@@ -186,7 +186,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.
-            $iImmediateChildren = $iImmediateChildren -1;
+            $iImmediateChildren = $iImmediateChildren - 1;
             if ($iImmediateChildren == 0)
             {
                 array_pop($path);

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
                         ));
                         return false;
                     }
-                }
-                catch(\Exception $e)
+                } catch(\Exception $e)
                 {
                     $this->oLogger->error(sprintf(
                         'Job %s cannot be added to remote : %s',$sAppId, $e->getMessage()

src/Component/Http/HttpGuzzlClient.php

Doc Comments +2 added lines, -2 removed lines

@@ -98,8 +98,8 @@
     }
 
     /**
-     * @param $sMethod
-     * @param $sUrl
+     * @param string $sMethod
+     * @param string $sUrl
      * @param $mData
      * @return HttpGuzzlResponse
      */

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
         catch (ClientException $oException) // 400 level errors
         {
             throw new HttpConnectionException(
-                sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()),
+                sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri').$sUrl, $oException->getCode()),
                 $oException->getCode(),
                 $oException
             );
@@ -71,7 +71,7 @@ 
         catch (ServerException $oException) // 500 level errors
         {
             throw new HttpConnectionException(
-                sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()),
+                sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri').$sUrl, $oException->getCode()),
                 $oException->getCode(),
                 $oException
             );
@@ -79,7 +79,7 @@ 
         catch (TooManyRedirectsException $oException) // too many redirects to follow
         {
             throw new HttpConnectionException(
-                sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),
+                sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri').$sUrl),
                 HttpConnectionException::ERROR_CODE_TOO_MANY_REDIRECT_EXCEPTION,
                 $oException
             );
@@ -87,7 +87,7 @@ 
         catch (ConnectException $oException) // networking error
         {
             throw new HttpConnectionException(
-                sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),
+                sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri').$sUrl),
                 HttpConnectionException::ERROR_CODE_CONNECT_EXCEPTION,
                 $oException
             );
@@ -95,7 +95,7 @@ 
         catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.)
         {
             throw new HttpConnectionException(
-                sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),
+                sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri').$sUrl),
                 HttpConnectionException::ERROR_CODE_REQUEST_EXCEPTION,
                 $oException
             );
@@ -103,7 +103,7 @@ 
         catch (\Exception $oException)
         {
             throw new HttpConnectionException(
-                sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),
+                sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri').$sUrl),
                 HttpConnectionException::ERROR_CODE_UNKNOWN,
                 $oException
             );

Braces +6 added lines, -12 removed lines

@@ -59,48 +59,42 @@
         {
             $_oResponse = $this->oGuzzelClient->request('GET', $sUrl, $_aRequestOptions);
             return new HttpGuzzlResponse($_oResponse);
-        }
-        catch (ClientException $oException) // 400 level errors
+        } catch (ClientException $oException) // 400 level errors
         {
             throw new HttpConnectionException(
                 sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()),
                 $oException->getCode(),
                 $oException
             );
-        }
-        catch (ServerException $oException) // 500 level errors
+        } catch (ServerException $oException) // 500 level errors
         {
             throw new HttpConnectionException(
                 sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()),
                 $oException->getCode(),
                 $oException
             );
-        }
-        catch (TooManyRedirectsException $oException) // too many redirects to follow
+        } catch (TooManyRedirectsException $oException) // too many redirects to follow
         {
             throw new HttpConnectionException(
                 sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),
                 HttpConnectionException::ERROR_CODE_TOO_MANY_REDIRECT_EXCEPTION,
                 $oException
             );
-        }
-        catch (ConnectException $oException) // networking error
+        } catch (ConnectException $oException) // networking error
         {
             throw new HttpConnectionException(
                 sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),
                 HttpConnectionException::ERROR_CODE_CONNECT_EXCEPTION,
                 $oException
             );
-        }
-        catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.)
+        } catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.)
         {
             throw new HttpConnectionException(
                 sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),
                 HttpConnectionException::ERROR_CODE_REQUEST_EXCEPTION,
                 $oException
             );
-        }
-        catch (\Exception $oException)
+        } catch (\Exception $oException)
         {
             throw new HttpConnectionException(
                 sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl),