caoym / phpboot

src/Application.php

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 use PhpBoot\DB\DB;
 use PhpBoot\DI\DIContainerBuilder;
 use PhpBoot\DI\Traits\EnableDIAnnotations;
-use PhpBoot\Lock\LocalAutoLock;
 use PhpBoot\Utils\Logger;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;

Spacing +19 added lines, -19 removed lines

@@ -83,11 +83,11 @@ 
 
             Request::class => \DI\factory([Application::class, 'createRequestFromGlobals']),
         ];
-        if(function_exists('apc_fetch')){
+        if (function_exists('apc_fetch')) {
             $default += [
                 Cache::class => \DI\object(ApcCache::class)
             ];
-        }else{
+        }else {
             $default += [
                 Cache::class => \DI\object(FilesystemCache::class)
                     ->constructorParameter('directory', sys_get_temp_dir())
@@ -129,11 +129,11 @@ 
      * @param string[] $hooks hook class names
      * @return void
      */
-    public function loadRoutesFromClass($className, $hooks=[])
+    public function loadRoutesFromClass($className, $hooks = [])
     {
         $cache = new CheckableCache($this->cache);
 
-        $key = 'loadRoutesFromClass:' . md5(__CLASS__ . ':' . $className);
+        $key = 'loadRoutesFromClass:'.md5(__CLASS__.':'.$className);
         $routes = $cache->get($key, $this);
 
         $controller = null;
@@ -150,9 +150,9 @@ 
             $this->routes[] = [
                 $method,
                 $uri,
-                function (Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
+                function(Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
 
-                    $key = 'loadRoutesFromClass:route:' . md5(__CLASS__ . ':' . $className . ':' . $actionName);
+                    $key = 'loadRoutesFromClass:route:'.md5(__CLASS__.':'.$className.':'.$actionName);
 
                     $routeInstance = $cache->get($key, $this);
                     if ($routeInstance == $this) {
@@ -180,11 +180,11 @@ 
      * @param string[] $hooks
      * @return void
      */
-    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks=[])
+    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks = [])
     {
         $dir = @dir($fromPath);
 
-        $getEach = function () use ($dir) {
+        $getEach = function() use ($dir) {
             $name = $dir->read();
             if (!$name) {
                 return $name;
@@ -196,11 +196,11 @@ 
             if ($entry == '.' || $entry == '..') {
                 continue;
             }
-            $path = $fromPath . '/' . str_replace('\\', '/', $entry);
+            $path = $fromPath.'/'.str_replace('\\', '/', $entry);
             if (is_file($path) && substr_compare($entry, '.php', strlen($entry) - 4, 4, true) == 0) {
-                $class_name = $namespace . '\\' . substr($entry, 0, strlen($entry) - 4);
+                $class_name = $namespace.'\\'.substr($entry, 0, strlen($entry) - 4);
                 $this->loadRoutesFromClass($class_name, $hooks);
-            } else {
+            }else {
                 //\Log::debug($path.' ignored');
             }
         }
@@ -213,7 +213,7 @@ 
      * @param callable $handler function(Application $app, Request $request):Response
      * @param string[] $hooks
      */
-    public function addRoute($method, $uri, callable $handler, $hooks=[])
+    public function addRoute($method, $uri, callable $handler, $hooks = [])
     {
         $this->routes[] = [$method, $uri, $handler, $hooks];
     }
@@ -239,7 +239,7 @@ 
     {
         //  TODO 把 Route里的异常处理 ExceptionRenderer 移到这里更妥?
         $renderer = $this->get(ExceptionRenderer::class);
-        try{
+        try {
             if ($request == null) {
                 $request = $this->make(Request::class);
             }
@@ -249,7 +249,7 @@ 
             }
             $uri = rawurldecode($uri);
 
-            $next = function (Request $request)use($uri){
+            $next = function(Request $request)use($uri){
                 $dispatcher = $this->getDispatcher();
                 $res = $dispatcher->dispatch($request->getMethod(), $uri);
                 if ($res[0] == Dispatcher::FOUND) {
@@ -258,10 +258,10 @@ 
                         $request->attributes->add($res[2]);
                     }
                     list($handler, $hooks) = $res[1];
-                    $next = function (Request $request)use($handler){
+                    $next = function(Request $request)use($handler){
                         return $handler($this, $request);
                     };
-                    foreach (array_reverse($hooks) as $hookName){
+                    foreach (array_reverse($hooks) as $hookName) {
                         $next = function($request)use($hookName, $next){
                             $hook = $this->get($hookName);
                             /**@var $hook HookInterface*/
@@ -274,12 +274,12 @@ 
                     \PhpBoot\abort(new NotFoundHttpException(), [$request->getMethod(), $uri]);
                 } elseif ($res[0] == Dispatcher::METHOD_NOT_ALLOWED) {
                     \PhpBoot\abort(new MethodNotAllowedHttpException($res[1]), [$request->getMethod(), $uri]);
-                } else {
+                }else {
                     \PhpBoot\abort("unknown dispatch return {$res[0]}");
                 }
             };
 
-            foreach (array_reverse($this->getGlobalHooks()) as $hookName){
+            foreach (array_reverse($this->getGlobalHooks()) as $hookName) {
                 $next = function($request)use($hookName, $next){
                     $hook = $this->get($hookName);
                     /**@var $hook HookInterface*/
@@ -294,7 +294,7 @@ 
             }
             return $response;
 
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $renderer->render($e);
         }
 

src/Controller/ControllerContainerBuilder.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use DI\FactoryInterface;
 use \DI\InvokerInterface as DIInvokerInterface;
 use Doctrine\Common\Cache\Cache;
-use PhpBoot\Cache\LocalCacheInterface;
 use PhpBoot\Controller\Annotations\BindAnnotationHandler;
 use PhpBoot\Controller\Annotations\ClassAnnotationHandler;
 use PhpBoot\Controller\Annotations\HookAnnotationHandler;

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 
 class ControllerContainerBuilder extends ContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [PathAnnotationHandler::class, "class.children[?name=='path']"],
         [RouteAnnotationHandler::class, "methods.*.children[?name=='route'][]"],
@@ -43,9 +43,9 @@ 
                                 Cache $cache,
                                 array $annotations = null)
     {
-        if($annotations){
+        if ($annotations) {
             parent::__construct($annotations, $cache);
-        }else{
+        }else {
             parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache);
         }
 

src/ORM/ModelContainerBuilder.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace PhpBoot\ORM;
 
-use DI\Container;
 use DI\FactoryInterface;
 use Doctrine\Common\Cache\Cache;
 use PhpBoot\DI\DIContainerBuilder;

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 class ModelContainerBuilder extends EntityContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [PKAnnotationHandler::class, "class.children[?name=='pk']"],
         [TableAnnotationHandler::class, "class.children[?name=='table']"],

src/Lock/FileLock.php

Spacing +2 added lines, -2 removed lines

@@ -10,10 +10,10 @@
     {
         $path = sys_get_temp_dir().'/lock_252a8fdc9b944af99a9bc53d2aea08f1/'.$key;
         $tmpFile = tempnam($path, 'lock');
-        if(SafeFileWriter::write($tmpFile, json_encode(['time'=>time(), 'ttl'=>$ttl]), false)){
+        if (SafeFileWriter::write($tmpFile, json_encode(['time'=>time(), 'ttl'=>$ttl]), false)) {
             $this->locked = true;
             return true;
-        }else{
+        }else {
             return false;
         }
     }

src/Lock/LocalAutoLock.php

Spacing +19 added lines, -19 removed lines

@@ -8,20 +8,20 @@ 
  */
 class LocalAutoLock
 {
-    static function lock($key, $seconds, callable $success, callable $error=null){
+    static function lock($key, $seconds, callable $success, callable $error = null) {
         $key = 'lock:'.$key;
-        if(function_exists('apc_add')){
+        if (function_exists('apc_add')) {
             $lock = new ApcLock();
-        }else{
+        }else {
             $lock = new FileLock();
         }
-        try{
-            if(!isset(self::$currentLock[$key])){
+        try {
+            if (!isset(self::$currentLock[$key])) {
                 self::$currentLock[$key] = 0;
             }
-            if(self::$currentLock[$key] == 0){  //未加锁
-                if(!$lock->lock($key, $seconds)){ //加锁失败
-                    if($error){
+            if (self::$currentLock[$key] == 0) {  //未加锁
+                if (!$lock->lock($key, $seconds)) { //加锁失败
+                    if ($error) {
                         return $error();
                     }
                     return;
@@ -29,34 +29,34 @@ 
             }
             //嵌套加锁
             self::$currentLock[$key]++;
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             return $error($e);
         }
         $res = null;
-        try{
+        try {
             $res = $success();
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             self::$currentLock[$key]--;
-            if(self::$currentLock[$key] == 0){
-                try{
+            if (self::$currentLock[$key] == 0) {
+                try {
                     $lock->unlock($key);
-                }catch (\Exception $e){
+                }catch (\Exception $e) {
 
                 }
             }
             throw $e;
         }
         self::$currentLock[$key]--;
-        if(self::$currentLock[$key] == 0){
-            try{
+        if (self::$currentLock[$key] == 0) {
+            try {
                 $lock->unlock($key);
-            }catch (\Exception $e){
+            }catch (\Exception $e) {
 
             }
         }
         return $res;
     }
 
-    private $cache=[];
-    static private $currentLock=[];
+    private $cache = [];
+    static private $currentLock = [];
 }
\ No newline at end of file

src/Lock/ApcLock.php

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@ 
 
     public function lock($key, $ttl)
     {
-        if(apc_add($key, 1, $ttl)){
+        if (apc_add($key, 1, $ttl)) {
             $this->locked = true;
             return true;
-        }else{
+        }else {
             return false;
         }
     }
@@ -21,5 +21,5 @@ 
         $this->locked = false;
         return $res;
     }
-    private $locked=false;
+    private $locked = false;
 }
\ No newline at end of file

src/Entity/EntityContainer.php

Spacing +25 added lines, -25 removed lines

@@ -14,21 +14,21 @@ 
 
     public function make($data, $validate = true)
     {
-        if($data === null){
+        if ($data === null) {
             return null;
         }
         $data instanceof \ArrayAccess || is_array($data) or \PhpBoot\abort(new \InvalidArgumentException("array is required by make {$this->className}, $data given"));
         $className = $this->getClassName();
         $obj = new $className();
         $vld = new Validator();
-        foreach ($this->properties as $p){
-            if($p->container && isset($data[$p->name])){
+        foreach ($this->properties as $p) {
+            if ($p->container && isset($data[$p->name])) {
                 $var = $data[$p->name];
-                if($p->container instanceof EntityContainer
-                    || $p->container instanceof ArrayContainer){
-                    if(!$var){
+                if ($p->container instanceof EntityContainer
+                    || $p->container instanceof ArrayContainer) {
+                    if (!$var) {
                         $var = [];
-                    }elseif(is_string($var)){
+                    }elseif (is_string($var)) {
                         $var = json_decode($var, true);
                         !json_last_error() or \PhpBoot\abort(new \InvalidArgumentException(__METHOD__.' failed while json_decode with '.json_last_error_msg()));
                     }
@@ -36,18 +36,18 @@ 
                 $data[$p->name] = $p->container->make($var, $validate);
             }
 
-            if($p->validation){
-                if(is_array($p->validation)){
+            if ($p->validation) {
+                if (is_array($p->validation)) {
                     $vld->rule($p->validation[0], $p->name.'.'.$p->validation[1]);
-                }else{
+                }else {
                     $vld->rule($p->validation, $p->name);
                 }
             }
-            if(!$p->isOptional && !$vld->hasRule('optional', $p->name)){
+            if (!$p->isOptional && !$vld->hasRule('optional', $p->name)) {
                 $vld->rule('required', $p->name);
             }
         }
-        if($validate){
+        if ($validate) {
             $vld = $vld->withData($data);
             $vld->validate() or \PhpBoot\abort(
                 new \InvalidArgumentException(
@@ -59,8 +59,8 @@ 
             );
         }
 
-        foreach ($this->properties as $p){
-            if(isset($data[$p->name])){
+        foreach ($this->properties as $p) {
+            if (isset($data[$p->name])) {
                 $obj->{$p->name} = $data[$p->name];
             }
         }
@@ -72,32 +72,32 @@ 
     {
         $className = $this->getClassName();
         $obj = new $className();
-        foreach ($this->properties as $p){
-            if($p->isOptional){
+        foreach ($this->properties as $p) {
+            if ($p->isOptional) {
                 $obj->{$p->name} = $p->default;
-            }elseif($p->container){
+            }elseif ($p->container) {
                 $var = $p->container->makeExample();
                 $obj->{$p->name} = $var;
-            }else{
+            }else {
                 $obj->{$p->name} = null;
             }
 
         }
         return $obj;
     }
-    public function getProperty($target){
-        if(array_key_exists($target, $this->properties)){
+    public function getProperty($target) {
+        if (array_key_exists($target, $this->properties)) {
             return $this->properties[$target];
         }
         return null;
     }
-    public function setProperty($target, PropertyMeta $meta){
+    public function setProperty($target, PropertyMeta $meta) {
         $this->properties[$target] = $meta;
     }
     /**
      * @return PropertyMeta[]
      */
-    public function getProperties(){
+    public function getProperties() {
         return $this->properties;
     }
 
@@ -157,7 +157,7 @@ 
     /**
      * @var PropertyMeta[]
      */
-    private $properties=[];
+    private $properties = [];
 
     /**
      * @var string
@@ -167,11 +167,11 @@ 
     /**
      * @var string
      */
-    private $description='';
+    private $description = '';
     /**
      * @var string
      */
-    private $summary='';
+    private $summary = '';
 
     /**
      * @var string

src/Entity/EntityContainerBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 
 class EntityContainerBuilder extends ContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [PropertyAnnotationHandler::class, 'properties'],
         [VarAnnotationHandler::class, "properties.*.children[?name=='var'][]"],
@@ -34,9 +34,9 @@ 
                                 array $annotations = null
                                 )
     {
-        if($annotations){
+        if ($annotations) {
             parent::__construct($annotations, $cache);
-        }else{
+        }else {
             parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache);
         }
         $this->factory = $factory;

src/Entity/ScalarTypeContainer.php

Spacing +2 added lines, -2 removed lines

@@ -10,10 +10,10 @@
     public function __construct($type)
     {
         $this->type = $type;
-        !$type || TypeHint::isScalarType($type)  or \PhpBoot\abort(new \InvalidArgumentException("$type is not scalar type"));
+        !$type || TypeHint::isScalarType($type) or \PhpBoot\abort(new \InvalidArgumentException("$type is not scalar type"));
     }
 
-    public function make($data, $validate = true){
+    public function make($data, $validate = true) {
         return TypeCast::cast($data, $this->type, $validate);
     }