bearsunday / BEAR.Package

src/Installer.php

Spacing +7 added lines, -7 removed lines

@@ -21,13 +21,13 @@ 
         $version = $event->getComposer()->getPackage()->getPrettyVersion();
         $hash = $event->getComposer()->getLocker()->getLockData()['hash'];
         $packageDir = dirname(__DIR__);
-        file_put_contents($packageDir . '/VERSION', $version);
-        file_put_contents($packageDir . '/ID', $hash);
+        file_put_contents($packageDir.'/VERSION', $version);
+        file_put_contents($packageDir.'/ID', $hash);
 
-        $targetHello = dirname(__DIR__) . '/vendor/bear/demo-apps/Demo.Helloworld';
-        $targetSandbox = dirname(__DIR__) . '/vendor/bear/demo-apps/Demo.Sandbox';
-        $helloApp = dirname(__DIR__) . '/apps/Demo.Helloworld';
-        $sandboxApp = dirname(__DIR__) . '/apps/Demo.Sandbox';
+        $targetHello = dirname(__DIR__).'/vendor/bear/demo-apps/Demo.Helloworld';
+        $targetSandbox = dirname(__DIR__).'/vendor/bear/demo-apps/Demo.Sandbox';
+        $helloApp = dirname(__DIR__).'/apps/Demo.Helloworld';
+        $sandboxApp = dirname(__DIR__).'/apps/Demo.Sandbox';
 
         if (file_exists($helloApp)) {
             unlink($helloApp);
@@ -38,6 +38,6 @@ 
         symlink($targetHello, $helloApp);
         symlink($targetSandbox, $sandboxApp);
 
-        include $packageDir . '/bin/bear.env';
+        include $packageDir.'/bin/bear.env';
     }
 }

src/Dev/Dev.php

Spacing +15 added lines, -15 removed lines

@@ -98,7 +98,7 @@ 
     ) {
         global $argv;
 
-        $this->web = $web ? : new Web;
+        $this->web = $web ?: new Web;
         if (is_null($server) && isset($_SERVER)) {
             $server = $_SERVER;
         }
@@ -107,7 +107,7 @@ 
         } elseif (isset($argv[2])) {
             $this->requestUri = $argv[2];
         }
-        $this->sapiName = $sapiName ? : php_sapi_name();
+        $this->sapiName = $sapiName ?: php_sapi_name();
     }
 
     /**
@@ -131,10 +131,10 @@ 
 
         // stop
         register_shutdown_function(
-            function () {
+            function() {
                 $xhprof = xhprof_disable();
                 if (!$xhprof) {
-                    error_log('xhprof failed in ' . __FILE__);
+                    error_log('xhprof failed in '.__FILE__);
 
                     return;
                 }
@@ -159,7 +159,7 @@ 
         ini_set('xdebug.collect_params', 0);
         ini_set('xdebug.max_nesting_level', 500);
         ini_set('xdebug.file_link_format', '/dev/edit/?file=%f&line=$l');
-        if (! ini_get('date.timezone')) {
+        if (!ini_get('date.timezone')) {
             date_default_timezone_set('Asia/Tokyo');
         }
 
@@ -171,7 +171,7 @@ 
      */
     public function registerErrorHandler()
     {
-        set_error_handler( function ($errNo, $errStr, $errFile, $errLine) {
+        set_error_handler(function($errNo, $errStr, $errFile, $errLine) {
             if (error_reporting() === 0) {
 
                 // return in error-control operator(@)
@@ -208,10 +208,10 @@ 
     public function registerExceptionHandler($logDir)
     {
         set_exception_handler(
-            function (\Exception $e) use ($logDir) {
+            function(\Exception $e) use ($logDir) {
                 $handler = new ExceptionHandler(
                     new SymfonyResponse(new ConsoleOutput),
-                    (dirname(__DIR__)) . '/Dev/Module/ExceptionHandle/template/exception.php'
+                    (dirname(__DIR__)).'/Dev/Module/ExceptionHandle/template/exception.php'
                 );
                 $handler->setLogDir($logDir);
                 $handler->handle($e);
@@ -250,7 +250,7 @@ 
     public function registerFatalErrorHandler()
     {
         register_shutdown_function(
-            function () {
+            function() {
                 if (PHP_SAPI === 'cli') {
                     return;
                 }
@@ -269,7 +269,7 @@ 
                 $outputBuffer = ob_get_clean();
                 error_log($outputBuffer);
                 http_response_code(500);
-                $html = require __DIR__ . '/view/fatal_error.php';
+                $html = require __DIR__.'/view/fatal_error.php';
                 echo $html;
                 exit(1);
             }
@@ -302,10 +302,10 @@ 
         if (isset($this->app->router)) {
             $this->route($this->app);
         }
-        if (! $this->web->isDevWebService($this->sapiName, $this->requestUri)) {
+        if (!$this->web->isDevWebService($this->sapiName, $this->requestUri)) {
             return '';
         }
-        $requestUri = $requestUri ? : $_SERVER['REQUEST_URI'];
+        $requestUri = $requestUri ?: $_SERVER['REQUEST_URI'];
         $html = $this->web->service($requestUri, $this->app, $this->appDir);
 
         return $html;
@@ -327,7 +327,7 @@ 
      */
     public function loadDevFunctions()
     {
-        error_log(__METHOD__  . ' is no longer necessary.');
+        error_log(__METHOD__.' is no longer necessary.');
 
         return $this;
     }
@@ -356,11 +356,11 @@ 
      */
     private function getVendorDirectory()
     {
-        $vendorDir = dirname(dirname(__DIR__)) . '/vendor';
+        $vendorDir = dirname(dirname(__DIR__)).'/vendor';
 
         if (strpos(__DIR__, '/vendor/bear/package') !== false) {
             $baseDir = explode('/vendor/bear/package', __DIR__)[0];
-            $vendorDir = $baseDir . '/vendor';
+            $vendorDir = $baseDir.'/vendor';
         }
         return $vendorDir;
     }

src/Dev/Debug/Debug.php

Spacing +5 added lines, -5 removed lines

@@ -22,13 +22,13 @@ 
 
         // label
         $receiver = $trace[0];
-        $method = (isset($trace[1]['class'])) ? " ({$trace[1]['class']}" . '::' . "{$trace[1]['function']})" : '';
+        $method = (isset($trace[1]['class'])) ? " ({$trace[1]['class']}".'::'."{$trace[1]['function']})" : '';
         preg_match(
             "/{$receiver['function']}\((.+)[\s,\)]/is",
             trim(file($receiver['file'])[$receiver['line'] - 1]),
             $matches
         );
-        list($varName, $varDump)  = isset($matches[1]) ? [$matches[1], $varDump] : ['(void)', '<br>'];
+        list($varName, $varDump) = isset($matches[1]) ? [$matches[1], $varDump] : ['(void)', '<br>'];
 
         if ($isCli) {
             self::outputCli($varName, $var, $receiver, $method);
@@ -53,7 +53,7 @@ 
         // contents
         $isCli = (PHP_SAPI === 'cli');
         $htmlErrors = ini_get('html_errors');
-        if (! extension_loaded('xdebug')) {
+        if (!extension_loaded('xdebug')) {
             ini_set('html_errors', 'On');
             return [$htmlErrors, $isCli];
         }
@@ -100,7 +100,7 @@ 
         $colorClose = "\033[0m";
         echo "{$colorOpenReverse}{$varName}{$colorClose} = ";
         var_dump($var);
-        echo $colorOpenPlain . "in {$colorOpenBold}{$receiver['file']}{$colorClose}{$colorOpenPlain}";
+        echo $colorOpenPlain."in {$colorOpenBold}{$receiver['file']}{$colorClose}{$colorOpenPlain}";
         echo "on line {$receiver['line']}{$method}{$colorClose}\n";
     }
 
@@ -113,7 +113,7 @@ 
      */
     private static function outputFb($var, $file, $line)
     {
-        $label = __FUNCTION__ . "() in {$file} on line {$line}";
+        $label = __FUNCTION__."() in {$file} on line {$line}";
         /** @noinspection PhpUndefinedClassInspection */
         /** @noinspection PhpUndefinedMethodInspection */
         FB::group($label);

src/Dev/Debug/ExceptionHandle/Screen.php

Spacing +6 added lines, -6 removed lines

@@ -120,10 +120,10 @@ 
         $fileArray = array_map('htmlspecialchars', $files);
         $fileArray[$line - 1] = "<span class=\"hit-line\">{$fileArray[$line - 1]}</span>";
         $shortListArray = array_slice($fileArray, $line - $num, $num * 2);
-        $shortListArray[$num - 1] = '<strong>' . $fileArray[$line - 1] . '</strong>';
+        $shortListArray[$num - 1] = '<strong>'.$fileArray[$line - 1].'</strong>';
         $shortList = implode('', $shortListArray);
-        $shortList = '<pre class="short-list" style="background-color: #F0F0F9;">' . $shortList . '</pre>';
-        $result .= $shortList . '</div>';
+        $shortList = '<pre class="short-list" style="background-color: #F0F0F9;">'.$shortList.'</pre>';
+        $result .= $shortList.'</div>';
 
         return $result;
     }
@@ -149,7 +149,7 @@ 
                 $divObject = $this->divObject($arg);
                 $objHash = spl_object_hash($arg);
                 $link = "<a href=\"#\" class=\"\" data-toggle=\"collapse\" data-target=\"#obj{$objHash}\">";
-                $arg = $link . '(object) ' . $this->getObjectName($arg) . '</a>';
+                $arg = $link.'(object) '.$this->getObjectName($arg).'</a>';
             }
             if (is_array($arg)) {
                 $this->makeArgsElementsScalar($arg);
@@ -157,7 +157,7 @@ 
             $html .= "<tr><td>{$index}</td><td>{$type}</td></td><td>{$arg}</td></tr>";
         }
         $html .= '</table>';
-        return $html . $divObject;
+        return $html.$divObject;
     }
 
     /**
@@ -205,7 +205,7 @@ 
      */
     private function getObjectName($obj)
     {
-        return '<strong>' . get_class($obj) . '</strong><span class="weak">#' . spl_object_hash($obj) . '</span>';
+        return '<strong>'.get_class($obj).'</strong><span class="weak">#'.spl_object_hash($obj).'</span>';
     }
 
     /**

src/Dev/Debug/ExceptionHandle/ExceptionHandler.php

Spacing +7 added lines, -7 removed lines

@@ -94,7 +94,7 @@ 
     ) {
         $this->viewTemplate = $exceptionTpl;
         $this->response = $response;
-        $this->errorPage = $errorPage ? : new ErrorPage;
+        $this->errorPage = $errorPage ?: new ErrorPage;
     }
 
     /**
@@ -132,7 +132,7 @@ 
      */
     private function buildErrorPage($e, ResourceObject $response)
     {
-        $exceptionId = 'e' . $response->code . '-' . substr(md5((string) $e), 0, 5);
+        $exceptionId = 'e'.$response->code.'-'.substr(md5((string) $e), 0, 5);
         try {
             throw $e;
         } catch (ResourceNotFound $e) {
@@ -179,9 +179,9 @@ 
         }
         $response->headers['X-EXCEPTION-CLASS'] = get_class($e);
         $response->headers['X-EXCEPTION-MESSAGE'] = str_replace(PHP_EOL, ' ', $e->getMessage());
-        $response->headers['X-EXCEPTION-CODE-FILE-LINE'] = '(' . $e->getCode() . ') ' . $e->getFile(
-        ) . ':' . $e->getLine();
-        $previous = $e->getPrevious() ? (get_class($e->getPrevious()) . ': ' . str_replace(
+        $response->headers['X-EXCEPTION-CODE-FILE-LINE'] = '('.$e->getCode().') '.$e->getFile(
+        ).':'.$e->getLine();
+        $previous = $e->getPrevious() ? (get_class($e->getPrevious()).': '.str_replace(
             PHP_EOL,
             ' ',
             $e->getPrevious()->getMessage()
@@ -260,10 +260,10 @@ 
         $data = (string) $e;
         $previousE = $e->getPrevious();
         if ($previousE) {
-            $data .= PHP_EOL . PHP_EOL . '-- Previous Exception --' . PHP_EOL . PHP_EOL;
+            $data .= PHP_EOL.PHP_EOL.'-- Previous Exception --'.PHP_EOL.PHP_EOL;
             $data .= $previousE->getTraceAsString();
         }
-        $data .= PHP_EOL . PHP_EOL . '-- Bindings --' . PHP_EOL . (string) $this->injector;
+        $data .= PHP_EOL.PHP_EOL.'-- Bindings --'.PHP_EOL.(string) $this->injector;
         $file = $this->getLogFilePath($exceptionId);
         if (is_writable($this->logDir)) {
             file_put_contents($file, $data);

src/Dev/Application/ApplicationReflector.php

Spacing +8 added lines, -8 removed lines

@@ -76,7 +76,7 @@ 
     private function getResourcesUris()
     {
         $resources = [];
-        $resourceDir = $this->appDir . '/Resource';
+        $resourceDir = $this->appDir.'/Resource';
         $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($resourceDir), RecursiveIteratorIterator::SELF_FIRST);
         foreach ($iterator as $item) {
             /** @var $item \SplFileInfo */
@@ -99,11 +99,11 @@ 
      */
     private function getUri(\SplFileInfo $file, $resourceDir)
     {
-        $relativePath = strtolower(str_replace($resourceDir . '/', '', (string) $file));
+        $relativePath = strtolower(str_replace($resourceDir.'/', '', (string) $file));
         $path = explode('/', $relativePath);
         $scheme = array_shift($path);
         $appName = 'self';
-        $uri = "{$scheme}://{$appName}/" . implode('/', $path);
+        $uri = "{$scheme}://{$appName}/".implode('/', $path);
         $uri = substr($uri, 0, -4);
 
         return $uri;
@@ -140,16 +140,16 @@ 
         $path = implode('/', array_map('ucwords', explode('/', $path)));
         $path = str_replace('//', '/', $path);
         // cut head /
-        $filePath = $this->appDir . '/Resource/' . ucwords($url['scheme']) . $path . '.php';
-        $fileContents = file_get_contents(__DIR__ . '/resource.tpl');
+        $filePath = $this->appDir.'/Resource/'.ucwords($url['scheme']).$path.'.php';
+        $fileContents = file_get_contents(__DIR__.'/resource.tpl');
         $fileContents = str_replace('{$app}', $this->appName, $fileContents);
-        $paths = explode('/', $this->appName . $path);
+        $paths = explode('/', $this->appName.$path);
         $class = array_pop($paths);
         $appName = array_shift($paths);
         $scheme = ucwords($url['scheme']);
         $namespace = "{$appName}\\Resource\\{$scheme}";
         if (count($paths) > 0) {
-            $namespace .= '\\' . implode('\\', $paths);
+            $namespace .= '\\'.implode('\\', $paths);
         }
         $fileContents = str_replace('{$namespace}', $namespace, $fileContents);
         $fileContents = str_replace('{$class}', $class, $fileContents);
@@ -205,7 +205,7 @@ 
         }
         $params = [];
         foreach ($allow as $method) {
-            $refMethod = new \ReflectionMethod($ro, 'on' . $method);
+            $refMethod = new \ReflectionMethod($ro, 'on'.$method);
             $parameters = $refMethod->getParameters();
             $paramArray = [];
             foreach ($parameters as $parameter) {

src/Dev/Module/ExceptionHandle/ExceptionHandleModule.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         $this
             ->bind('')
             ->annotatedWith('exceptionTpl')
-            ->toInstance(__DIR__ . '/template/exception.php');
+            ->toInstance(__DIR__.'/template/exception.php');
         $this
             ->bind('BEAR\Resource\ResourceObject')
             ->annotatedWith('errorPage')

src/Dev/Resource/ResourceLog.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
     private function getPageLog(ExtendedPdo $db, $page)
     {
         $result = $db->fetchAll(
-            'SELECT * FROM `log` WHERE `extra_page` = ' . "'{$page}' ORDER BY id ASC"
+            'SELECT * FROM `log` WHERE `extra_page` = '."'{$page}' ORDER BY id ASC"
         );
         $logs = [];
         $log = '';
@@ -89,7 +89,7 @@ 
             $body = print_a(json_decode($log['body'], true), "return:1");
             $meta = $this->getHeaderInfo($log['req'], $log['header']);
             if ($meta) {
-                $body .= '<i class="icon-info-sign"></i><br>' . print_a($meta, "return:1");
+                $body .= '<i class="icon-info-sign"></i><br>'.print_a($meta, "return:1");
             }
             $tableBody .= <<<EOT
                 <tr>
@@ -103,7 +103,7 @@ 
 EOT;
         }
         $path = isset($log['path']) ? $log['path'] : '';
-        $body = $this->getTableOpen($path, $logs) . $tableBody . self::TABLE_CLOSE;
+        $body = $this->getTableOpen($path, $logs).$tableBody.self::TABLE_CLOSE;
 
         return $body;
     }
@@ -160,7 +160,7 @@ 
         $meta = [];
 
         $method = substr($req, 0, 3);
-        $onMethod = 'on' . ucwords($method);
+        $onMethod = 'on'.ucwords($method);
         $header = json_decode($header, true);
 
         // interceptors

src/Dev/Web/Editor/FileTree.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
      */
     private function getPath($path)
     {
-        if (! is_array($path)) {
+        if (!is_array($path)) {
             $isDir = 'true';
             $path = $this->root;