ChumakovAnton / Calculator

prefill.php

Spacing +30 added lines, -30 removed lines

@@ -4,35 +4,35 @@ 
 define('COL_DEFAULT', 2);
 
 $fields = [
-    'author_name' =>            ['Your name',             '',                                                ''],
-    'author_github_username' => ['Your Github username',  '<username> in https://github.com/username',       ''],
-    'author_email' =>           ['Your email address',    '',                                                ''],
-    'author_twitter' =>         ['Your twitter username', '',                                                '@{author_github_username}'],
-    'author_website' =>         ['Your website',          '',                                                'https://github.com/{author_github_username}'],
+    'author_name' =>            ['Your name', '', ''],
+    'author_github_username' => ['Your Github username', '<username> in https://github.com/username', ''],
+    'author_email' =>           ['Your email address', '', ''],
+    'author_twitter' =>         ['Your twitter username', '', '@{author_github_username}'],
+    'author_website' =>         ['Your website', '', 'https://github.com/{author_github_username}'],
 
-    'package_vendor' =>         ['Package vendor',        '<vendor> in https://github.com/vendor/package',   '{author_github_username}'],
-    'package_name' =>           ['Package name',          '<package> in https://github.com/vendor/package',  ''],
-    'package_description' =>    ['Package very short description',   '',                                     ''],
+    'package_vendor' =>         ['Package vendor', '<vendor> in https://github.com/vendor/package', '{author_github_username}'],
+    'package_name' =>           ['Package name', '<package> in https://github.com/vendor/package', ''],
+    'package_description' =>    ['Package very short description', '', ''],
 
-    'psr4_namespace' =>         ['PSR-4 namespace',       'usually, Vendor\\Package',                        '{package_vendor}\\{package_name}'],
+    'psr4_namespace' =>         ['PSR-4 namespace', 'usually, Vendor\\Package', '{package_vendor}\\{package_name}'],
 ];
 
 $values = [];
 
 $replacements = [
-    ':vendor\\\\:package_name\\\\' => function () use(&$values) { return str_replace('\\', '\\\\', $values['psr4_namespace']) . '\\\\'; },
-    ':author_name'                 => function () use(&$values) { return $values['author_name']; },
-    ':author_username'             => function () use(&$values) { return $values['author_github_username']; },
-    ':author_website'              => function () use(&$values) { return $values['author_website'] ?: ('https://github.com/' . $values['author_github_username']); },
-    ':author_email'                => function () use(&$values) { return $values['author_email'] ?: ($values['author_github_username'] . '@example.com'); },
-    ':vendor'                      => function () use(&$values) { return $values['package_vendor']; },
-    ':package_name'                => function () use(&$values) { return $values['package_name']; },
-    ':package_description'         => function () use(&$values) { return $values['package_description']; },
-    'League\\Skeleton'             => function () use(&$values) { return $values['psr4_namespace']; },
+    ':vendor\\\\:package_name\\\\' => function() use(&$values) { return str_replace('\\', '\\\\', $values['psr4_namespace']).'\\\\'; },
+    ':author_name'                 => function() use(&$values) { return $values['author_name']; },
+    ':author_username'             => function() use(&$values) { return $values['author_github_username']; },
+    ':author_website'              => function() use(&$values) { return $values['author_website'] ?: ('https://github.com/'.$values['author_github_username']); },
+    ':author_email'                => function() use(&$values) { return $values['author_email'] ?: ($values['author_github_username'].'@example.com'); },
+    ':vendor'                      => function() use(&$values) { return $values['package_vendor']; },
+    ':package_name'                => function() use(&$values) { return $values['package_name']; },
+    ':package_description'         => function() use(&$values) { return $values['package_description']; },
+    'League\\Skeleton'             => function() use(&$values) { return $values['psr4_namespace']; },
 ];
 
-function read_from_console ($prompt) {
-    if ( function_exists('readline') ) {
+function read_from_console($prompt) {
+    if (function_exists('readline')) {
         $line = trim(readline($prompt));
         if (!empty($line)) {
             readline_add_history($line);
@@ -68,12 +68,12 @@ 
     echo "Please, provide the following information:\n";
     echo "----------------------------------------------------------------------\n";
     foreach ($fields as $f => $field) {
-        $default = isset($field[COL_DEFAULT]) ? interpolate($field[COL_DEFAULT], $values): '';
+        $default = isset($field[COL_DEFAULT]) ? interpolate($field[COL_DEFAULT], $values) : '';
         $prompt = sprintf(
             '%s%s%s: ',
             $field[COL_DESCRIPTION],
-            $field[COL_HELP] ? ' (' . $field[COL_HELP] . ')': '',
-            $field[COL_DEFAULT] !== '' ? ' [' . $default . ']': ''
+            $field[COL_HELP] ? ' ('.$field[COL_HELP].')' : '',
+            $field[COL_DEFAULT] !== '' ? ' ['.$default.']' : ''
         );
         $values[$f] = read_from_console($prompt);
         if (empty($values[$f])) {
@@ -86,18 +86,18 @@ 
     echo "Please, check that everything is correct:\n";
     echo "----------------------------------------------------------------------\n";
     foreach ($fields as $f => $field) {
-        echo $field[COL_DESCRIPTION] . ": $values[$f]\n";
+        echo $field[COL_DESCRIPTION].": $values[$f]\n";
     }
     echo "\n";
 } while (($modify = strtolower(read_from_console('Modify files with these values? [y/N/q] '))) != 'y');
 echo "\n";
 
 $files = array_merge(
-    glob(__DIR__ . '/*.md'),
-    glob(__DIR__ . '/*.xml.dist'),
-    glob(__DIR__ . '/composer.json'),
-    glob(__DIR__ . '/src/*.php'),
-    glob(__DIR__ . '/tests/*.php')
+    glob(__DIR__.'/*.md'),
+    glob(__DIR__.'/*.xml.dist'),
+    glob(__DIR__.'/composer.json'),
+    glob(__DIR__.'/src/*.php'),
+    glob(__DIR__.'/tests/*.php')
 );
 foreach ($files as $f) {
     $contents = file_get_contents($f);
@@ -108,4 +108,4 @@ 
 }
 
 echo "Done.\n";
-echo "Now you should remove the file '" . basename(__FILE__) . "'.\n";
+echo "Now you should remove the file '".basename(__FILE__)."'.\n";

src/ExpressionCalculator.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $rootExpression = null;
         $expressionPoint = null;
         foreach ($matches[0] as $key => $value) {
-            $expression = new ExpressionStackItem(new DefaultOperation($matches[2][$key]), (float)$matches[1][$key]);
+            $expression = new ExpressionStackItem(new DefaultOperation($matches[2][$key]), (float) $matches[1][$key]);
 
             if (null === $rootExpression) {
                 $rootExpression = $expression;