danielgp / info-compare

source/OutputFormBuilder.php

Spacing +18 added lines, -18 removed lines

@@ -31,10 +31,10 @@ 
 
     private function listOfKnownLabels($knownLabels)
     {
-        $informatorKnownLabels = array_diff($knownLabels, ['--- List of known labels']);
-        $tmpOptions            = [];
+        $informatorKnownLabels = array_diff($knownLabels, [ '--- List of known labels' ]);
+        $tmpOptions            = [ ];
         foreach ($informatorKnownLabels as $value) {
-            $tmpOptions[] = '<input type="radio" name="Label" id="Label_' . $value . '" value="' . $value . '" '
+            $tmpOptions[ ] = '<input type="radio" name="Label" id="Label_' . $value . '" value="' . $value . '" '
                     . $this->turnRequestedValueIntoCheckboxStatus('Label', $value)
                     . '/>'
                     . '<label for="Label_' . $value . '">' . $value . '</label>';
@@ -47,38 +47,38 @@ 
 
     private function providers($inArray)
     {
-        $tmpOptions = [];
-        foreach ($this->config['Servers'] as $key => $value) {
-            $tmpOptions[] = '<a href="' . $value['url'] . '" target="_blank">run-me</a>&nbsp;'
-                    . '<input type="radio" name="' . $inArray['ConfigName'] . '" id="'
-                    . $inArray['ConfigName'] . '_' . $key . '" value="' . $key . '" '
-                    . $this->turnRequestedValueIntoCheckboxStatus($inArray['ConfigName'], $key)
+        $tmpOptions = [ ];
+        foreach ($this->config[ 'Servers' ] as $key => $value) {
+            $tmpOptions[ ] = '<a href="' . $value[ 'url' ] . '" target="_blank">run-me</a>&nbsp;'
+                    . '<input type="radio" name="' . $inArray[ 'ConfigName' ] . '" id="'
+                    . $inArray[ 'ConfigName' ] . '_' . $key . '" value="' . $key . '" '
+                    . $this->turnRequestedValueIntoCheckboxStatus($inArray[ 'ConfigName' ], $key)
                     . '/>'
-                    . '<label for="' . $inArray['ConfigName'] . '_' . $key . '">' . $value['name'] . '</label>';
+                    . '<label for="' . $inArray[ 'ConfigName' ] . '_' . $key . '">' . $value[ 'name' ] . '</label>';
         }
         return '<fieldset style="float:left;">'
-                . '<legend>' . $inArray['TitleStart'] . ' config providers</legend>'
+                . '<legend>' . $inArray[ 'TitleStart' ] . ' config providers</legend>'
                 . implode('<br/>', $tmpOptions)
                 . '</fieldset>';
     }
 
     protected function setFormOptions($knownLabels)
     {
-        $sReturn   = [];
-        $sReturn[] = $this->typeOfResults();
-        $sReturn[] = $this->providers([
+        $sReturn   = [ ];
+        $sReturn[ ] = $this->typeOfResults();
+        $sReturn[ ] = $this->providers([
             'TitleStart' => 'Source',
             'ConfigName' => 'localConfig',
         ]);
-        $sReturn[] = $this->providers([
+        $sReturn[ ] = $this->providers([
             'TitleStart' => 'Target',
             'ConfigName' => 'serverConfig',
         ]);
-        $sReturn[] = $this->listOfKnownLabels($knownLabels);
+        $sReturn[ ] = $this->listOfKnownLabels($knownLabels);
         return '<div class="tabbertab" id="tabOptions" title="Options">'
                 . '<style type="text/css" media="all" scoped>label { width: auto; }</style>'
                 . '<form method="get" action="'
-                . $_SERVER['PHP_SELF'] . '">'
+                . $_SERVER[ 'PHP_SELF' ] . '">'
                 . '<input type="submit" value="Apply" />'
                 . '<br/>' . implode('', $sReturn)
                 . '</form>'
@@ -88,7 +88,7 @@ 
 
     private function turnRequestedValueIntoCheckboxStatus($requestedName, $checkedValue)
     {
-        $requestedNameValue = $this->informatorInternalArray['sGlobals']->get($requestedName);
+        $requestedNameValue = $this->informatorInternalArray[ 'sGlobals' ]->get($requestedName);
         $checkboxStatus     = '';
         if ($requestedNameValue === $checkedValue) {
             $checkboxStatus = 'checked ';

source/Compare.php

Spacing +73 added lines, -73 removed lines

@@ -40,7 +40,7 @@ 
         \danielgp\info_compare\ConfigurationCompare,
         \danielgp\info_compare\OutputFormBuilder;
 
-    private $informatorInternalArray = [];
+    private $informatorInternalArray = [ ];
     private $localConfiguration;
     private $serverConfiguration;
     private $config;
@@ -57,9 +57,9 @@ 
             'name'                => 'Info-Compare'
         ];
         echo $this->setHeaderHtml();
-        $knownLabels            = $this->prepareForOutputForm();
+        $knownLabels = $this->prepareForOutputForm();
         echo $this->setFormOptions($knownLabels);
-        if (isset($_GET['Label'])) {
+        if (isset($_GET[ 'Label' ])) {
             $this->processInfos();
             echo $this->setFormCurlInfos();
             echo $this->setFormInfos();
@@ -72,62 +72,62 @@ 
         if ((!is_array($firstArray)) || (!is_array($secondArray))) {
             return '';
         }
-        $firstRow     = $this->mergeArraysIntoFirstSecond($firstArray, $secondArray, ['first', 'second']);
-        $secondRow    = $this->mergeArraysIntoFirstSecond($secondArray, $firstArray, ['second', 'first']);
+        $firstRow     = $this->mergeArraysIntoFirstSecond($firstArray, $secondArray, [ 'first', 'second' ]);
+        $secondRow    = $this->mergeArraysIntoFirstSecond($secondArray, $firstArray, [ 'second', 'first' ]);
         $row          = array_merge($firstRow, $secondRow);
         ksort($row);
-        $urlArguments = '?Label=' . $_GET['Label'];
-        $sString[]    = '<table style="width:100%">'
+        $urlArguments = '?Label=' . $_GET[ 'Label' ];
+        $sString[ ]    = '<table style="width:100%">'
                 . '<thead><tr>'
                 . '<th>Identifier</th>'
-                . '<th><a href="' . $this->config['Servers'][$_GET['localConfig']]['url']
+                . '<th><a href="' . $this->config[ 'Servers' ][ $_GET[ 'localConfig' ] ][ 'url' ]
                 . $urlArguments . '" target="_blank">'
-                . $this->config['Servers'][$_GET['localConfig']]['name'] . '</a></th>'
-                . '<th><a href="' . $this->config['Servers'][$_GET['serverConfig']]['url']
+                . $this->config[ 'Servers' ][ $_GET[ 'localConfig' ] ][ 'name' ] . '</a></th>'
+                . '<th><a href="' . $this->config[ 'Servers' ][ $_GET[ 'serverConfig' ] ][ 'url' ]
                 . $urlArguments . '" target="_blank">'
-                . $this->config['Servers'][$_GET['serverConfig']]['name'] . '</a></th>'
+                . $this->config[ 'Servers' ][ $_GET[ 'serverConfig' ] ][ 'name' ] . '</a></th>'
                 . '</tr></thead>'
                 . '<tbody>';
-        if ($_GET['displayOnlyDifferent'] == '1') {
+        if ($_GET[ 'displayOnlyDifferent' ] == '1') {
             $displayOnlyDifferent = true;
         } else {
             $displayOnlyDifferent = false;
         }
         foreach ($row as $key => $value) {
             $rowString = '<tr><td style="width:20%;">' . $key . '</td><td style="width:40%;">'
-                    . str_replace(',', ', ', $value['first']) . '</td><td style="width:40%;">'
-                    . str_replace(',', ', ', $value['second']) . '</td></tr>';
+                    . str_replace(',', ', ', $value[ 'first' ]) . '</td><td style="width:40%;">'
+                    . str_replace(',', ', ', $value[ 'second' ]) . '</td></tr>';
             if ($displayOnlyDifferent) {
-                if ($value['first'] != $value['second']) {
-                    $sString[] = $rowString;
+                if ($value[ 'first' ] != $value[ 'second' ]) {
+                    $sString[ ] = $rowString;
                 }
             } else {
-                $sString[] = $rowString;
+                $sString[ ] = $rowString;
             }
         }
-        $sString[] = '</tbody></table>';
+        $sString[ ] = '</tbody></table>';
         return implode('', $sString);
     }
 
     private function getConfiguration()
     {
         $storedConfiguration = $this->configuredDeployedInformators();
-        foreach ($storedConfiguration['informators'] as $key => $value) {
-            $this->config['Servers'][] = [
+        foreach ($storedConfiguration[ 'informators' ] as $key => $value) {
+            $this->config[ 'Servers' ][ ] = [
                 'name' => $key,
                 'url'  => $value,
             ];
         }
-        $haystack                                = array_keys($storedConfiguration['informators']);
-        $this->config['Defaults']['Label']       = $storedConfiguration['default']['label'];
-        $this->config['Defaults']['Source']      = array_search($storedConfiguration['default']['source'], $haystack);
-        $this->config['Defaults']['Target']      = array_search($storedConfiguration['default']['target'], $haystack);
-        $this->config['Defaults']['ResultsType'] = $storedConfiguration['default']['typeOfResults'];
+        $haystack                                = array_keys($storedConfiguration[ 'informators' ]);
+        $this->config[ 'Defaults' ][ 'Label' ]       = $storedConfiguration[ 'default' ][ 'label' ];
+        $this->config[ 'Defaults' ][ 'Source' ]      = array_search($storedConfiguration[ 'default' ][ 'source' ], $haystack);
+        $this->config[ 'Defaults' ][ 'Target' ]      = array_search($storedConfiguration[ 'default' ][ 'target' ], $haystack);
+        $this->config[ 'Defaults' ][ 'ResultsType' ] = $storedConfiguration[ 'default' ][ 'typeOfResults' ];
     }
 
-    private function mergeArraysIntoFirstSecond($firstArray, $secondArray, $pSequence = ['first', 'second'])
+    private function mergeArraysIntoFirstSecond($firstArray, $secondArray, $pSequence = [ 'first', 'second' ])
     {
-        $row = [];
+        $row = [ ];
         foreach ($firstArray as $key => $value) {
             if (is_array($value)) {
                 foreach ($value as $key2 => $value2) {
@@ -136,39 +136,39 @@ 
                             if (is_array($value3)) {
                                 foreach ($value3 as $key4 => $value4) {
                                     $keyCrt                      = $key . '_' . $key2 . '__' . $key3 . '__' . $key4;
-                                    $row[$keyCrt][$pSequence[0]] = $value4;
-                                    if (isset($secondArray[$key][$key2][$key3][$key4])) {
-                                        $row[$keyCrt][$pSequence[1]] = $secondArray[$key][$key2][$key3][$key4];
+                                    $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value4;
+                                    if (isset($secondArray[ $key ][ $key2 ][ $key3 ][ $key4 ])) {
+                                        $row[ $keyCrt ][ $pSequence[ 1 ] ] = $secondArray[ $key ][ $key2 ][ $key3 ][ $key4 ];
                                     } else {
-                                        $row[$keyCrt][$pSequence[1]] = '';
+                                        $row[ $keyCrt ][ $pSequence[ 1 ] ] = '';
                                     }
                                 }
                             } else {
                                 $keyCrt                      = $key . '_' . $key2 . '__' . $key3;
-                                $row[$keyCrt][$pSequence[0]] = $value3;
-                                if (isset($secondArray[$key][$key2][$key3])) {
-                                    $row[$keyCrt][$pSequence[1]] = $secondArray[$key][$key2][$key3];
+                                $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value3;
+                                if (isset($secondArray[ $key ][ $key2 ][ $key3 ])) {
+                                    $row[ $keyCrt ][ $pSequence[ 1 ] ] = $secondArray[ $key ][ $key2 ][ $key3 ];
                                 } else {
-                                    $row[$keyCrt][$pSequence[1]] = '';
+                                    $row[ $keyCrt ][ $pSequence[ 1 ] ] = '';
                                 }
                             }
                         }
                     } else {
                         $keyCrt                      = $key . '_' . $key2;
-                        $row[$keyCrt][$pSequence[0]] = $value2;
-                        if (isset($secondArray[$key][$key2])) {
-                            $row[$keyCrt][$pSequence[1]] = $secondArray[$key][$key2];
+                        $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value2;
+                        if (isset($secondArray[ $key ][ $key2 ])) {
+                            $row[ $keyCrt ][ $pSequence[ 1 ] ] = $secondArray[ $key ][ $key2 ];
                         } else {
-                            $row[$keyCrt][$pSequence[1]] = '';
+                            $row[ $keyCrt ][ $pSequence[ 1 ] ] = '';
                         }
                     }
                 }
             } else {
-                $row[$key][$pSequence[0]] = $value;
-                if (isset($secondArray[$key])) {
-                    $row[$key][$pSequence[1]] = $secondArray[$key];
+                $row[ $key ][ $pSequence[ 0 ] ] = $value;
+                if (isset($secondArray[ $key ])) {
+                    $row[ $key ][ $pSequence[ 1 ] ] = $secondArray[ $key ];
                 } else {
-                    $row[$key][$pSequence[1]] = '';
+                    $row[ $key ][ $pSequence[ 1 ] ] = '';
                 }
             }
         }
@@ -179,51 +179,51 @@ 
     {
         $this->setDefaultOptions();
         $rqst                                      = new \Symfony\Component\HttpFoundation\Request;
-        $this->informatorInternalArray['sGlobals'] = $rqst->createFromGlobals();
-        $urlToGetLbl                               = $this->config['Servers'
-                . ''][$this->config['Defaults']['Source']]['url']
+        $this->informatorInternalArray[ 'sGlobals' ] = $rqst->createFromGlobals();
+        $urlToGetLbl                               = $this->config[ 'Servers'
+                . '' ][ $this->config[ 'Defaults' ][ 'Source' ] ][ 'url' ]
                 . '?Label=---' . urlencode(' List of known labels');
         $knownLabels                               = $this->getContentFromUrlThroughCurlAsArrayIfJson($urlToGetLbl);
-        return $knownLabels['response'];
+        return $knownLabels[ 'response' ];
     }
 
     private function processInfos()
     {
-        if (isset($_GET['localConfig']) && isset($_GET['serverConfig'])) {
-            $urlArguments              = '?Label=' . urlencode($_GET['Label']);
-            $source                    = $this->config['Servers'][$_GET['localConfig']]['url'] . $urlArguments;
+        if (isset($_GET[ 'localConfig' ]) && isset($_GET[ 'serverConfig' ])) {
+            $urlArguments              = '?Label=' . urlencode($_GET[ 'Label' ]);
+            $source                    = $this->config[ 'Servers' ][ $_GET[ 'localConfig' ] ][ 'url' ] . $urlArguments;
             $this->localConfiguration  = $this->getContentFromUrlThroughCurlAsArrayIfJson($source);
-            $destination               = $this->config['Servers'][$_GET['serverConfig']]['url'] . $urlArguments;
+            $destination               = $this->config[ 'Servers' ][ $_GET[ 'serverConfig' ] ][ 'url' ] . $urlArguments;
             $this->serverConfiguration = $this->getContentFromUrlThroughCurlAsArrayIfJson($destination);
         } else {
-            $this->localConfiguration  = ['response' => '', 'info' => ''];
-            $this->serverConfiguration = ['response' => '', 'info' => ''];
+            $this->localConfiguration  = [ 'response' => '', 'info' => '' ];
+            $this->serverConfiguration = [ 'response' => '', 'info' => '' ];
         }
     }
 
     private function setDefaultOptions()
     {
-        if (!isset($_GET['displayOnlyDifferent'])) {
-            $_GET['displayOnlyDifferent'] = $this->config['Defaults']['ResultsType'];
+        if (!isset($_GET[ 'displayOnlyDifferent' ])) {
+            $_GET[ 'displayOnlyDifferent' ] = $this->config[ 'Defaults' ][ 'ResultsType' ];
         }
-        if (!isset($_GET['localConfig'])) {
-            $_GET['localConfig'] = $this->config['Defaults']['Source'];
+        if (!isset($_GET[ 'localConfig' ])) {
+            $_GET[ 'localConfig' ] = $this->config[ 'Defaults' ][ 'Source' ];
         }
-        if (!isset($_GET['serverConfig'])) {
-            $_GET['serverConfig'] = $this->config['Defaults']['Target'];
+        if (!isset($_GET[ 'serverConfig' ])) {
+            $_GET[ 'serverConfig' ] = $this->config[ 'Defaults' ][ 'Target' ];
         }
-        if (!isset($_GET['Label'])) {
-            $_GET['Label'] = $this->config['Defaults']['Label'];
+        if (!isset($_GET[ 'Label' ])) {
+            $_GET[ 'Label' ] = $this->config[ 'Defaults' ][ 'Label' ];
         }
     }
 
     private function setFooterHtml()
     {
-        $sReturn   = [];
-        $sReturn[] = '</div><!-- from main Tabber -->';
-        $sReturn[] = '<div class="resetOnly author">&copy; 2015 Daniel Popiniuc</div>';
-        $sReturn[] = '<hr/>';
-        $sReturn[] = '<div class="disclaimer">'
+        $sReturn   = [ ];
+        $sReturn[ ] = '</div><!-- from main Tabber -->';
+        $sReturn[ ] = '<div class="resetOnly author">&copy; 2015 Daniel Popiniuc</div>';
+        $sReturn[ ] = '<hr/>';
+        $sReturn[ ] = '<div class="disclaimer">'
                 . 'The developer cannot be liable of any data input or results, '
                 . 'included but not limited to any implication of these '
                 . '(anywhere and whomever there might be these)!'
@@ -233,8 +233,8 @@ 
 
     private function setFormCurlInfos()
     {
-        $source      = $this->localConfiguration['info'];
-        $destination = $this->serverConfiguration['info'];
+        $source      = $this->localConfiguration[ 'info' ];
+        $destination = $this->serverConfiguration[ 'info' ];
         return '<div class="tabbertab" id="tabCurl" title="CURL infos">'
                 . $this->displayTableFromMultiLevelArray($source, $destination)
                 . '</div><!--from tabCurl-->';
@@ -242,10 +242,10 @@ 
 
     private function setFormInfos()
     {
-        $source      = $this->localConfiguration['response'];
-        $destination = $this->serverConfiguration['response'];
+        $source      = $this->localConfiguration[ 'response' ];
+        $destination = $this->serverConfiguration[ 'response' ];
         return '<div class="tabbertab'
-                . (isset($_GET['Label']) ? ' tabbertabdefault' : '')
+                . (isset($_GET[ 'Label' ]) ? ' tabbertabdefault' : '')
                 . '" id="tabConfigs" title="Informations">'
                 . $this->displayTableFromMultiLevelArray($source, $destination)
                 . '</div><!--from tabConfigs-->';
@@ -255,12 +255,12 @@ 
     {
         return $this->setHeaderCommon([
                     'lang'       => 'en-US',
-                    'title'      => $this->applicationFlags['name'],
+                    'title'      => $this->applicationFlags[ 'name' ],
                     'css'        => 'css/main.css',
                     'javascript' => 'js/tabber.min.js',
                 ])
                 . $this->setJavascriptContent('document.write(\'<style type="text/css">.tabber{display:none;}</style>\');')
-                . '<h1>' . $this->applicationFlags['name'] . '</h1>'
+                . '<h1>' . $this->applicationFlags[ 'name' ] . '</h1>'
                 . '<div class="tabber" id="tab">';
     }
 }