codysnider / tt-rss

lib/MiniTemplator.class.php

Indentation +8 added lines, -8 removed lines

@@ -315,18 +315,18 @@ 
     switch (strtoupper($cmd)) {

     case '$BEGINBLOCK':

      if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) {
-             return false;
-     }
+                return false;
+        }
         break;

     case '$ENDBLOCK':

      if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) {
-             return false;
-     }
+                return false;
+        }
         break;

     case '$INCLUDE':

      if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) {
-             return false;
-     }
+                return false;
+        }
         $resumeFromStart = true;

         break;

     default:

@@ -848,8 +848,8 @@ 
     switch ($this->outputMode) {

     case 0:            // output to PHP output stream

      if (!print($s)) {
-             $this->outputError = true;
-     }
+                $this->outputError = true;
+        }
         break;

     case 1:            // output to file

      $rc = fwrite($this->outputFileHandle, $s);

docker/application/configure-db.php

Switch Indentation +8 added lines, -8 removed lines

@@ -26,14 +26,14 @@
     $config['DB_PORT'] = env('DB_PORT');
     if (empty($config['DB_TYPE'])) {
         switch ($config['DB_PORT']) {
-            case 3306:
-                $config['DB_TYPE'] = 'mysql';
-                break;
-            case 5432:
-                $config['DB_TYPE'] = 'pgsql';
-                break;
-            default:
-                error('Database on non-standard port ' . $config['DB_PORT'] . ' and env DB_TYPE not present');
+        case 3306:
+            $config['DB_TYPE'] = 'mysql';
+            break;
+        case 5432:
+            $config['DB_TYPE'] = 'pgsql';
+            break;
+        default:
+            error('Database on non-standard port ' . $config['DB_PORT'] . ' and env DB_TYPE not present');
         }
     }
 }

Spacing +18 added lines, -18 removed lines

@@ -16,8 +16,8 @@ 
     $eport = 3306;
 }
 if (!empty($eport)) {
-    $config['DB_HOST'] = env('DB_PORT_' . $eport . '_TCP_ADDR');
-    $config['DB_PORT'] = env('DB_PORT_' . $eport . '_TCP_PORT');
+    $config['DB_HOST'] = env('DB_PORT_'.$eport.'_TCP_ADDR');
+    $config['DB_PORT'] = env('DB_PORT_'.$eport.'_TCP_PORT');
 } elseif (getenv('DB_PORT') === false) {
     error('The env DB_PORT does not exist. Make sure to run with "--link mypostgresinstance:DB"');
 } elseif (is_numeric(getenv('DB_PORT')) && getenv('DB_HOST') !== false) {
@@ -33,7 +33,7 @@ 
                 $config['DB_TYPE'] = 'pgsql';
                 break;
             default:
-                error('Database on non-standard port ' . $config['DB_PORT'] . ' and env DB_TYPE not present');
+                error('Database on non-standard port '.$config['DB_PORT'].' and env DB_TYPE not present');
         }
     }
 }
@@ -45,7 +45,7 @@ 
 $config['DB_USER'] = env('DB_USER', $config['DB_NAME']);
 $config['DB_PASS'] = env('DB_PASS', $config['DB_USER']);
 if (!dbcheck($config)) {
-    echo 'Database login failed, trying to create...' . PHP_EOL;
+    echo 'Database login failed, trying to create...'.PHP_EOL;
     // superuser account to create new database and corresponding user account
     //   username (SU_USER) can be supplied or defaults to "docker"
     //   password (SU_PASS) can be supplied or defaults to username
@@ -55,15 +55,15 @@ 
     $super['DB_PASS'] = env('DB_ENV_PASS', $super['DB_USER']);
     $pdo = dbconnect($super);
     if ($super['DB_TYPE'] === 'mysql') {
-        $pdo->exec('CREATE DATABASE ' . ($config['DB_NAME']));
-        $pdo->exec('GRANT ALL PRIVILEGES ON ' . ($config['DB_NAME']) . '.* TO ' . $pdo->quote($config['DB_USER']) . '@"%" IDENTIFIED BY ' . $pdo->quote($config['DB_PASS']));
+        $pdo->exec('CREATE DATABASE '.($config['DB_NAME']));
+        $pdo->exec('GRANT ALL PRIVILEGES ON '.($config['DB_NAME']).'.* TO '.$pdo->quote($config['DB_USER']).'@"%" IDENTIFIED BY '.$pdo->quote($config['DB_PASS']));
     } else {
-        $pdo->exec('CREATE ROLE ' . ($config['DB_USER']) . ' WITH LOGIN PASSWORD ' . $pdo->quote($config['DB_PASS']));
-        $pdo->exec('CREATE DATABASE ' . ($config['DB_NAME']) . ' WITH OWNER ' . ($config['DB_USER']));
+        $pdo->exec('CREATE ROLE '.($config['DB_USER']).' WITH LOGIN PASSWORD '.$pdo->quote($config['DB_PASS']));
+        $pdo->exec('CREATE DATABASE '.($config['DB_NAME']).' WITH OWNER '.($config['DB_USER']));
     }
     unset($pdo);
     if (dbcheck($config)) {
-        echo 'Database login created and confirmed' . PHP_EOL;
+        echo 'Database login created and confirmed'.PHP_EOL;
     } else {
         error('Database login failed, trying to create login failed as well');
     }
@@ -74,8 +74,8 @@ 
     // reached this point => table found, assume db is complete
 }
 catch (PDOException $e) {
-    echo 'Database table not found, applying schema... ' . PHP_EOL;
-    $schema = file_get_contents('schema/ttrss_schema_' . $config['DB_TYPE'] . '.sql');
+    echo 'Database table not found, applying schema... '.PHP_EOL;
+    $schema = file_get_contents('schema/ttrss_schema_'.$config['DB_TYPE'].'.sql');
     $schema = preg_replace('/--(.*?);/', '', $schema);
     $schema = preg_replace('/[\r\n]/', ' ', $schema);
     $schema = trim($schema, ' ;');
@@ -88,35 +88,35 @@ 
 foreach ($_SERVER as $name => $value) {
     if (strpos($name, $config_prefix) === 0) {
         $name = substr($name, strlen($config_prefix));
-        echo 'Getting config from env: ' . $name . PHP_EOL;
+        echo 'Getting config from env: '.$name.PHP_EOL;
         $config[$name] = $value;
     }
 }
 $contents = file_get_contents($confpath);
 foreach ($config as $name => $value) {
-    $contents = preg_replace('/(define\s*\(\'' . $name . '\',\s*)(.*)(\);)/', '$1"' . $value . '"$3', $contents);
+    $contents = preg_replace('/(define\s*\(\''.$name.'\',\s*)(.*)(\);)/', '$1"'.$value.'"$3', $contents);
 }
 file_put_contents($confpath, $contents);
 function env($name, $default = null)
 {
     $v = getenv($name) ?: $default;
     if ($v === null) {
-        error('The env ' . $name . ' does not exist');
+        error('The env '.$name.' does not exist');
     }
     return $v;
 }
 function error($text)
 {
-    echo 'Error: ' . $text . PHP_EOL;
+    echo 'Error: '.$text.PHP_EOL;
     exit(1);
 }
 function dbconnect($config)
 {
     $map = array('host' => 'HOST', 'port' => 'PORT', 'dbname' => 'NAME');
-    $dsn = $config['DB_TYPE'] . ':';
+    $dsn = $config['DB_TYPE'].':';
     foreach ($map as $d => $h) {
-        if (isset($config['DB_' . $h])) {
-            $dsn .= $d . '=' . $config['DB_' . $h] . ';';
+        if (isset($config['DB_'.$h])) {
+            $dsn .= $d.'='.$config['DB_'.$h].';';
         }
     }
     $pdo = new \PDO($dsn, $config['DB_USER'], $config['DB_PASS']);

Braces +2 added lines, -4 removed lines

@@ -72,8 +72,7 @@ 
 try {
     $pdo->query('SELECT 1 FROM ttrss_feeds');
     // reached this point => table found, assume db is complete
-}
-catch (PDOException $e) {
+} catch (PDOException $e) {
     echo 'Database table not found, applying schema... ' . PHP_EOL;
     $schema = file_get_contents('schema/ttrss_schema_' . $config['DB_TYPE'] . '.sql');
     $schema = preg_replace('/--(.*?);/', '', $schema);
@@ -128,8 +127,7 @@ 
     try {
         dbconnect($config);
         return true;
-    }
-    catch (PDOException $e) {
+    } catch (PDOException $e) {
         return false;
     }
 }

tmp/view-cache/8c/8caf7b703c7d5b8d66cfe70ae4004bdfc8a929be0594bff5e96fc5518172abd8.php

Spacing +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 
     public function getDebugInfo()
     {
-        return array (  37 => 1,);
+        return array(37 => 1,);
     }
 
     public function getSourceContext()

src/Components/Twig/Filters.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                     }
                 }
                 if (T_CLASS === $tokens[$index][0] && T_WHITESPACE === $tokens[$index + 1][0] && T_STRING === $tokens[$index + 2][0]) {
-                    $index           += 2;
+                    $index += 2;
                     $filterClasses[] = $namespace.'\\'.$tokens[$index][1];
                     break;
                 }

src/Components/Twig/Functions.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                     }
                 }
                 if (T_CLASS === $tokens[$index][0] && T_WHITESPACE === $tokens[$index + 1][0] && T_STRING === $tokens[$index + 2][0]) {
-                    $index           += 2;
+                    $index += 2;
                     $functionClasses[] = $namespace.'\\'.$tokens[$index][1];
                     break;
                 }

src/Components/Twig/Filters/StaticFiles.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     {
         $query = "";
         if (!(strpos($filename, "?") === false)) {
-            $query = substr($filename, strpos($filename, "?")+1);
+            $query = substr($filename, strpos($filename, "?") + 1);
             $filename = substr($filename, 0, strpos($filename, "?"));
         }
         $timestamp = filemtime(BASEPATH.DS.'public'.DS.'js'.DS.$filename);

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
             $filename = substr($filename, 0, strpos($filename, "?"));
         }
         $timestamp = filemtime(BASEPATH.DS.'public'.DS.'js'.DS.$filename);
-        if ($query) $timestamp .= "&$query";
+        if ($query) {
+            $timestamp .= "&$query";
+        }
 
         return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/js/$filename?$timestamp\"></script>\n";
     }

include/controls.php

Indentation +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
  */
 function javascript_tag($filename)
 {
-	user_error(__FUNCTION__.' is deprecated', E_USER_DEPRECATED);
+    user_error(__FUNCTION__.' is deprecated', E_USER_DEPRECATED);
 }
 
 function format_warning($msg, $id = "") {