@@ -219,7 +219,9 @@ discard block |
||
| 219 | 219 | $repositoryAdapterName = $repositoryName.'Adapter'; |
| 220 | 220 | $repositoryNamespace = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName; |
| 221 | 221 | |
| 222 | - if($namespace) return $repositoryNamespace; |
|
| 222 | + if($namespace) {
|
|
| 223 | + return $repositoryNamespace; |
|
| 224 | + } |
|
| 223 | 225 | |
| 224 | 226 | //and eventually we conclude the adapter class of the repository package as an instance. |
| 225 | 227 | return app()->resolve($repositoryNamespace)->adapter(); |
@@ -290,8 +292,7 @@ discard block |
||
| 290 | 292 | |
| 291 | 293 | if(self::app()->has('locale')){
|
| 292 | 294 | $defaultLocale = self::app()->get('locale');
|
| 293 | - } |
|
| 294 | - else{
|
|
| 295 | + } else{
|
|
| 295 | 296 | $defaultLocale = config('app.locale');
|
| 296 | 297 | } |
| 297 | 298 | |
@@ -24,29 +24,29 @@ discard block |
||
| 24 | 24 | * @param $arg |
| 25 | 25 | * @return mixed |
| 26 | 26 | */ |
| 27 | - public static function annotationsLoaders($service,$arg) |
|
| 27 | + public static function annotationsLoaders($service, $arg) |
|
| 28 | 28 | {
|
| 29 | 29 | //factory runner |
| 30 | - if($service=="factory"){
|
|
| 30 | + if ($service=="factory") {
|
|
| 31 | 31 | return self::factory(); |
| 32 | 32 | } |
| 33 | 33 | //if $name starts with $needles for repository |
| 34 | - if(Str::endsWith($service,'Repository')){
|
|
| 34 | + if (Str::endsWith($service, 'Repository')) {
|
|
| 35 | 35 | return self::repository($service); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | //if $name starts with $needles for source |
| 39 | - if(Str::endsWith($service,'Source')){
|
|
| 40 | - return self::source($service,$arg); |
|
| 39 | + if (Str::endsWith($service, 'Source')) {
|
|
| 40 | + return self::source($service, $arg); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | //if $name starts with $needles for model |
| 44 | - if(Str::endsWith($service,'Builder')){
|
|
| 44 | + if (Str::endsWith($service, 'Builder')) {
|
|
| 45 | 45 | return self::Builder(ucfirst($service)); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | - if(method_exists(new self,$service)){
|
|
| 49 | + if (method_exists(new self, $service)) {
|
|
| 50 | 50 | return self::$service($arg); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | private static function builder($service) |
| 100 | 100 | {
|
| 101 | 101 | //we are making a namespace assignment for the builder. |
| 102 | - $builder=app()->namespace()->builder().'\BuilderMap'; |
|
| 102 | + $builder = app()->namespace()->builder().'\BuilderMap'; |
|
| 103 | 103 | |
| 104 | 104 | //we are getting builder instance. |
| 105 | 105 | return app()->resolve($builder); |
@@ -127,16 +127,16 @@ discard block |
||
| 127 | 127 | * @param array $bind |
| 128 | 128 | * @return mixed |
| 129 | 129 | */ |
| 130 | - public function container($instance,$class,$bind=array()) |
|
| 130 | + public function container($instance, $class, $bind = array()) |
|
| 131 | 131 | {
|
| 132 | - if(!property_exists($instance->container(),$class)){
|
|
| 132 | + if (!property_exists($instance->container(), $class)) {
|
|
| 133 | 133 | throw new \InvalidArgumentException('container object false for ('.$class.') object');
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - $container=$instance->container()->{$class};
|
|
| 136 | + $container = $instance->container()->{$class};
|
|
| 137 | 137 | |
| 138 | - if(!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)){
|
|
| 139 | - return $instance->resolve($container,$bind); |
|
| 138 | + if (!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)) {
|
|
| 139 | + return $instance->resolve($container, $bind); |
|
| 140 | 140 | } |
| 141 | 141 | return $instance->container()->{$class};
|
| 142 | 142 | } |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function createAppInstance($object) |
| 148 | 148 | {
|
| 149 | - if(!defined('appInstance')){
|
|
| 150 | - define('appInstance',(base64_encode(serialize($object))));
|
|
| 149 | + if (!defined('appInstance')) {
|
|
| 150 | + define('appInstance', (base64_encode(serialize($object))));
|
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
@@ -155,9 +155,9 @@ discard block |
||
| 155 | 155 | * @param array $arg |
| 156 | 156 | * @return mixed |
| 157 | 157 | */ |
| 158 | - private static function date($arg=array()) |
|
| 158 | + private static function date($arg = array()) |
|
| 159 | 159 | {
|
| 160 | - $locale = (count($arg)=="0") ? config('app.locale','en') : current($arg);
|
|
| 160 | + $locale = (count($arg)=="0") ? config('app.locale', 'en') : current($arg);
|
|
| 161 | 161 | |
| 162 | 162 | return app()->resolve(Date::class)->setLocale($locale); |
| 163 | 163 | } |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | {
|
| 178 | 178 | //we save an instance for the entire application |
| 179 | 179 | //and add it to the helper file to be accessed from anywhere in the application. |
| 180 | - if(!isset(self::$instance['appInstance'])){
|
|
| 181 | - self::$instance['appInstance']=unserialize(base64_decode(appInstance)); |
|
| 180 | + if (!isset(self::$instance['appInstance'])) {
|
|
| 181 | + self::$instance['appInstance'] = unserialize(base64_decode(appInstance)); |
|
| 182 | 182 | return self::$instance['appInstance']; |
| 183 | 183 | } |
| 184 | 184 | return self::$instance['appInstance']; |
@@ -205,9 +205,9 @@ discard block |
||
| 205 | 205 | */ |
| 206 | 206 | private static function queue() |
| 207 | 207 | {
|
| 208 | - if(!isset(self::$instance['queue'])){
|
|
| 208 | + if (!isset(self::$instance['queue'])) {
|
|
| 209 | 209 | |
| 210 | - self::$instance['queue']=(new Queue()); |
|
| 210 | + self::$instance['queue'] = (new Queue()); |
|
| 211 | 211 | return self::$instance['queue']; |
| 212 | 212 | |
| 213 | 213 | } |
@@ -219,18 +219,18 @@ discard block |
||
| 219 | 219 | * @param bool $namespace |
| 220 | 220 | * @return string |
| 221 | 221 | */ |
| 222 | - public static function repository($service,$namespace=false) |
|
| 222 | + public static function repository($service, $namespace = false) |
|
| 223 | 223 | {
|
| 224 | 224 | //I can get the repository name from the magic method as a salt repository, |
| 225 | 225 | //after which we will edit it as an adapter namespace. |
| 226 | - $repositoryName=ucfirst(preg_replace('@Repository@is','',$service));
|
|
| 226 | + $repositoryName = ucfirst(preg_replace('@Repository@is', '', $service));
|
|
| 227 | 227 | |
| 228 | 228 | //If we then configure the name of the simple repository to be an adapter |
| 229 | 229 | //then we will give the user an example of the adapter class in each repository call. |
| 230 | 230 | $repositoryAdapterName = $repositoryName.'Adapter'; |
| 231 | 231 | $repositoryNamespace = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName; |
| 232 | 232 | |
| 233 | - if($namespace) return $repositoryNamespace; |
|
| 233 | + if ($namespace) return $repositoryNamespace; |
|
| 234 | 234 | |
| 235 | 235 | //and eventually we conclude the adapter class of the repository package as an instance. |
| 236 | 236 | return app()->resolve($repositoryNamespace)->adapter(); |
@@ -241,17 +241,17 @@ discard block |
||
| 241 | 241 | * @param $arg |
| 242 | 242 | * @return mixed |
| 243 | 243 | */ |
| 244 | - private static function source($service,$arg) |
|
| 244 | + private static function source($service, $arg) |
|
| 245 | 245 | {
|
| 246 | 246 | //get Source path |
| 247 | - $service=ucfirst($service); |
|
| 248 | - $getCalledClass=str_replace('\\'.class_basename($arg[0]),'',get_class($arg[0]));
|
|
| 249 | - $getCalledClass=class_basename($getCalledClass); |
|
| 247 | + $service = ucfirst($service); |
|
| 248 | + $getCalledClass = str_replace('\\'.class_basename($arg[0]), '', get_class($arg[0]));
|
|
| 249 | + $getCalledClass = class_basename($getCalledClass); |
|
| 250 | 250 | |
| 251 | - $service=str_replace($getCalledClass,'',$service); |
|
| 251 | + $service = str_replace($getCalledClass, '', $service); |
|
| 252 | 252 | |
| 253 | 253 | //run service for endpoint |
| 254 | - $serviceSource=StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main'; |
|
| 254 | + $serviceSource = StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main'; |
|
| 255 | 255 | return app()->resolve($serviceSource); |
| 256 | 256 | } |
| 257 | 257 | |
@@ -260,9 +260,9 @@ discard block |
||
| 260 | 260 | */ |
| 261 | 261 | public static function redis() |
| 262 | 262 | {
|
| 263 | - if(!isset(self::$instance['redis'])){
|
|
| 263 | + if (!isset(self::$instance['redis'])) {
|
|
| 264 | 264 | |
| 265 | - self::$instance['redis']=(new Redis())->client(); |
|
| 265 | + self::$instance['redis'] = (new Redis())->client(); |
|
| 266 | 266 | return self::$instance['redis']; |
| 267 | 267 | |
| 268 | 268 | } |
@@ -273,13 +273,13 @@ discard block |
||
| 273 | 273 | * @param null $param |
| 274 | 274 | * @return array|null|string |
| 275 | 275 | */ |
| 276 | - public function route($param=null) |
|
| 276 | + public function route($param = null) |
|
| 277 | 277 | {
|
| 278 | - $kernel=self::getAppInstance()->kernel; |
|
| 278 | + $kernel = self::getAppInstance()->kernel; |
|
| 279 | 279 | |
| 280 | - $saltRouteParameters=$kernel->routeParameters; |
|
| 280 | + $saltRouteParameters = $kernel->routeParameters; |
|
| 281 | 281 | |
| 282 | - if($param===null){
|
|
| 282 | + if ($param===null) {
|
|
| 283 | 283 | return $saltRouteParameters; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -295,25 +295,25 @@ discard block |
||
| 295 | 295 | * @param array $select |
| 296 | 296 | * @return mixed|string |
| 297 | 297 | */ |
| 298 | - public function translator($data,$select=array()) |
|
| 298 | + public function translator($data, $select = array()) |
|
| 299 | 299 | {
|
| 300 | 300 | $languageDir = path()->appLanguage(); |
| 301 | 301 | |
| 302 | - $lang=(new Lingua($languageDir)); |
|
| 302 | + $lang = (new Lingua($languageDir)); |
|
| 303 | 303 | |
| 304 | - if(self::app()->has('locale')){
|
|
| 304 | + if (self::app()->has('locale')) {
|
|
| 305 | 305 | $defaultLocale = self::app()->get('locale');
|
| 306 | 306 | } |
| 307 | - else{
|
|
| 307 | + else {
|
|
| 308 | 308 | $defaultLocale = config('app.locale');
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | - if(!file_exists($languageDir.''.DIRECTORY_SEPARATOR.''.$defaultLocale)){
|
|
| 311 | + if (!file_exists($languageDir.''.DIRECTORY_SEPARATOR.''.$defaultLocale)) {
|
|
| 312 | 312 | $defaultLocale = config('app.fallback_locale');
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | - if(count($select)){
|
|
| 316 | - return $lang->include(['default'])->locale($defaultLocale)->get($data,$select); |
|
| 315 | + if (count($select)) {
|
|
| 316 | + return $lang->include(['default'])->locale($defaultLocale)->get($data, $select); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | return $lang->include(['default'])->locale($defaultLocale)->get($data); |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | * @param null $default |
| 15 | 15 | * @return mixed |
| 16 | 16 | */ |
| 17 | - public function input($key, $default=null); |
|
| 17 | + public function input($key, $default = null); |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * @param $key |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | protected function getAutoGenerators() |
| 33 | 33 | {
|
| 34 | - if(property_exists($this,'auto_generators')){
|
|
| 34 | + if (property_exists($this, 'auto_generators')) {
|
|
| 35 | 35 | return $this->auto_generators; |
| 36 | 36 | } |
| 37 | 37 | return []; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | protected function getAutoGeneratorsDontOverwrite() |
| 47 | 47 | {
|
| 48 | - if(property_exists($this,'auto_generators_dont_overwrite')){
|
|
| 48 | + if (property_exists($this, 'auto_generators_dont_overwrite')) {
|
|
| 49 | 49 | return $this->auto_generators_dont_overwrite; |
| 50 | 50 | } |
| 51 | 51 | return []; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | protected function getClientObjects() |
| 61 | 61 | {
|
| 62 | - return array_diff_key($this->getObjects(),['inputs'=>[]]); |
|
| 62 | + return array_diff_key($this->getObjects(), ['inputs'=>[]]); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | protected function getGenerators() |
| 71 | 71 | {
|
| 72 | - if(property_exists($this,'generators')){
|
|
| 72 | + if (property_exists($this, 'generators')) {
|
|
| 73 | 73 | return $this->generators; |
| 74 | 74 | } |
| 75 | 75 | return []; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | protected function getGeneratorsDontOverwrite() |
| 85 | 85 | {
|
| 86 | - if(property_exists($this,'generators_dont_overwrite')){
|
|
| 86 | + if (property_exists($this, 'generators_dont_overwrite')) {
|
|
| 87 | 87 | return $this->generators_dont_overwrite; |
| 88 | 88 | } |
| 89 | 89 | return []; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * @param $key |
| 23 | 23 | * @return mixed |
| 24 | 24 | */ |
| 25 | - abstract function annotation($method,$key); |
|
| 25 | + abstract function annotation($method, $key); |
|
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * get input values from request object |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * |
| 53 | 53 | * @param $reflection |
| 54 | 54 | */ |
| 55 | - public function setReflection($reflection){
|
|
| 55 | + public function setReflection($reflection) {
|
|
| 56 | 56 | |
| 57 | 57 | $this->request = ClosureDispatcher::bind($reflection); |
| 58 | 58 | } |
@@ -8,89 +8,89 @@ |
||
| 8 | 8 | * @param null|string $msg |
| 9 | 9 | * @return mixed |
| 10 | 10 | */ |
| 11 | - public function accessDeniedHttpException($msg=null); |
|
| 11 | + public function accessDeniedHttpException($msg = null); |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * @param null|string $msg |
| 15 | 15 | * @return mixed |
| 16 | 16 | */ |
| 17 | - public function invalidArgument($msg=null); |
|
| 17 | + public function invalidArgument($msg = null); |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * @param null|string $msg |
| 21 | 21 | * @return mixed |
| 22 | 22 | */ |
| 23 | - public function badFunctionCall($msg=null); |
|
| 23 | + public function badFunctionCall($msg = null); |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * @param null|string $msg |
| 27 | 27 | * @return mixed |
| 28 | 28 | */ |
| 29 | - public function badMethodCall($msg=null); |
|
| 29 | + public function badMethodCall($msg = null); |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * @param null|string $msg |
| 33 | 33 | * @return mixed |
| 34 | 34 | */ |
| 35 | - public function domain($msg=null); |
|
| 35 | + public function domain($msg = null); |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @param null|string $msg |
| 39 | 39 | * @return mixed |
| 40 | 40 | */ |
| 41 | - public function length($msg=null); |
|
| 41 | + public function length($msg = null); |
|
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * @param null|string $msg |
| 45 | 45 | * @return mixed |
| 46 | 46 | */ |
| 47 | - public function logic($msg=null); |
|
| 47 | + public function logic($msg = null); |
|
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * @param null|string $msg |
| 51 | 51 | * @return mixed |
| 52 | 52 | */ |
| 53 | - public function notFoundException($msg=null); |
|
| 53 | + public function notFoundException($msg = null); |
|
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * @param null|string $msg |
| 57 | 57 | * @return mixed |
| 58 | 58 | */ |
| 59 | - public function fileNotFoundException($msg=null); |
|
| 59 | + public function fileNotFoundException($msg = null); |
|
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | 62 | * @param null|string $msg |
| 63 | 63 | * @return mixed |
| 64 | 64 | */ |
| 65 | - public function outOfRange($msg=null); |
|
| 65 | + public function outOfRange($msg = null); |
|
| 66 | 66 | |
| 67 | 67 | /** |
| 68 | 68 | * @param null|string $msg |
| 69 | 69 | * @return mixed |
| 70 | 70 | */ |
| 71 | - public function overflow($msg=null); |
|
| 71 | + public function overflow($msg = null); |
|
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | 74 | * @param null|string $msg |
| 75 | 75 | * @return mixed |
| 76 | 76 | */ |
| 77 | - public function range($msg=null); |
|
| 77 | + public function range($msg = null); |
|
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | 80 | * @param null|string $msg |
| 81 | 81 | * @return mixed |
| 82 | 82 | */ |
| 83 | - public function runtime($msg=null); |
|
| 83 | + public function runtime($msg = null); |
|
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | 86 | * @param null|string $msg |
| 87 | 87 | * @return mixed |
| 88 | 88 | */ |
| 89 | - public function underflow($msg=null); |
|
| 89 | + public function underflow($msg = null); |
|
| 90 | 90 | |
| 91 | 91 | /** |
| 92 | 92 | * @param null|string $msg |
| 93 | 93 | * @return mixed |
| 94 | 94 | */ |
| 95 | - public function unexpectedValue($msg=null); |
|
| 95 | + public function unexpectedValue($msg = null); |
|
| 96 | 96 | } |
| 97 | 97 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @return null |
| 30 | 30 | * |
| 31 | 31 | */ |
| 32 | - public function accessDeniedHttpException($msg=null) |
|
| 32 | + public function accessDeniedHttpException($msg = null) |
|
| 33 | 33 | {
|
| 34 | 34 | return $this->accessDeniedHttp($msg); |
| 35 | 35 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * |
| 40 | 40 | * @param null|string $msg |
| 41 | 41 | */ |
| 42 | - public function invalidArgument($msg=null) |
|
| 42 | + public function invalidArgument($msg = null) |
|
| 43 | 43 | {
|
| 44 | 44 | throw new InvalidArgumentException($msg); |
| 45 | 45 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * |
| 50 | 50 | * @param null|string $msg |
| 51 | 51 | */ |
| 52 | - public function badFunctionCall($msg=null) |
|
| 52 | + public function badFunctionCall($msg = null) |
|
| 53 | 53 | {
|
| 54 | 54 | throw new BadFunctionCallException($msg); |
| 55 | 55 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | * |
| 60 | 60 | * @param null|string $msg |
| 61 | 61 | */ |
| 62 | - public function badMethodCall($msg=null) |
|
| 62 | + public function badMethodCall($msg = null) |
|
| 63 | 63 | {
|
| 64 | 64 | throw new BadMethodCallException($msg); |
| 65 | 65 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * |
| 70 | 70 | * @param null|string $msg |
| 71 | 71 | */ |
| 72 | - public function domain($msg=null) |
|
| 72 | + public function domain($msg = null) |
|
| 73 | 73 | {
|
| 74 | 74 | throw new DomainException($msg); |
| 75 | 75 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | * |
| 80 | 80 | * @param null|string $msg |
| 81 | 81 | */ |
| 82 | - public function length($msg=null) |
|
| 82 | + public function length($msg = null) |
|
| 83 | 83 | {
|
| 84 | 84 | throw new LengthException($msg); |
| 85 | 85 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * |
| 90 | 90 | * @param null|string $msg |
| 91 | 91 | */ |
| 92 | - public function logic($msg=null) |
|
| 92 | + public function logic($msg = null) |
|
| 93 | 93 | {
|
| 94 | 94 | throw new LogicException($msg); |
| 95 | 95 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * @return null |
| 102 | 102 | * |
| 103 | 103 | */ |
| 104 | - public function notFoundException($msg=null) |
|
| 104 | + public function notFoundException($msg = null) |
|
| 105 | 105 | {
|
| 106 | 106 | return $this->notFound($msg); |
| 107 | 107 | } |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | * @return mixed|void |
| 114 | 114 | * |
| 115 | 115 | */ |
| 116 | - public function fileNotFoundException($msg=null) |
|
| 116 | + public function fileNotFoundException($msg = null) |
|
| 117 | 117 | {
|
| 118 | 118 | return $this->fileNotFound($msg); |
| 119 | 119 | } |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | * |
| 124 | 124 | * @param null|string $msg |
| 125 | 125 | */ |
| 126 | - public function outOfRange($msg=null) |
|
| 126 | + public function outOfRange($msg = null) |
|
| 127 | 127 | {
|
| 128 | 128 | throw new OutOfRangeException($msg); |
| 129 | 129 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | * |
| 134 | 134 | * @param null|string $msg |
| 135 | 135 | */ |
| 136 | - public function overflow($msg=null) |
|
| 136 | + public function overflow($msg = null) |
|
| 137 | 137 | {
|
| 138 | 138 | throw new OverflowException($msg); |
| 139 | 139 | } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | * |
| 144 | 144 | * @param null|string $msg |
| 145 | 145 | */ |
| 146 | - public function range($msg=null) |
|
| 146 | + public function range($msg = null) |
|
| 147 | 147 | {
|
| 148 | 148 | throw new RangeException($msg); |
| 149 | 149 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * |
| 154 | 154 | * @param null|string $msg |
| 155 | 155 | */ |
| 156 | - public function runtime($msg=null) |
|
| 156 | + public function runtime($msg = null) |
|
| 157 | 157 | {
|
| 158 | 158 | throw new RuntimeException($msg); |
| 159 | 159 | } |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * |
| 164 | 164 | * @param null|string $msg |
| 165 | 165 | */ |
| 166 | - public function underflow($msg=null) |
|
| 166 | + public function underflow($msg = null) |
|
| 167 | 167 | {
|
| 168 | 168 | throw new UnderflowException($msg); |
| 169 | 169 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | * |
| 174 | 174 | * @param null|string $msg |
| 175 | 175 | */ |
| 176 | - public function unexpectedValue($msg=null) |
|
| 176 | + public function unexpectedValue($msg = null) |
|
| 177 | 177 | {
|
| 178 | 178 | throw new UnexpectedValueException($msg); |
| 179 | 179 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | * @param null $default |
| 21 | 21 | * @return mixed |
| 22 | 22 | */ |
| 23 | - public function input($key, $default=null); |
|
| 23 | + public function input($key, $default = null); |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * @param $key |
@@ -45,5 +45,5 @@ discard block |
||
| 45 | 45 | * @param $value |
| 46 | 46 | * @return void |
| 47 | 47 | */ |
| 48 | - public function set($key,$value); |
|
| 48 | + public function set($key, $value); |
|
| 49 | 49 | } |
| 50 | 50 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function handle() |
| 24 | 24 | { |
| 25 | - foreach ($this->tableFilters() as $table=>$files){ |
|
| 25 | + foreach ($this->tableFilters() as $table=>$files) { |
|
| 26 | 26 | |
| 27 | 27 | $table = strtolower($table); |
| 28 | 28 | |
@@ -30,20 +30,20 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | $checkMigrationMain = $this->schema->getConnection()->checkMigrationMain(); |
| 32 | 32 | |
| 33 | - if($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])){ |
|
| 34 | - $this->apply($this->tableFilters()['Migrations'][0],'migrations'); |
|
| 33 | + if ($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])) { |
|
| 34 | + $this->apply($this->tableFilters()['Migrations'][0], 'migrations'); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - $checkMigration = $this->schema->getConnection()->checkMigration($table,$file); |
|
| 37 | + $checkMigration = $this->schema->getConnection()->checkMigration($table, $file); |
|
| 38 | 38 | |
| 39 | - if(!$checkMigration){ |
|
| 39 | + if (!$checkMigration) { |
|
| 40 | 40 | |
| 41 | - $getClassName = preg_replace('@(\d+)_@is','',$file); |
|
| 41 | + $getClassName = preg_replace('@(\d+)_@is', '', $file); |
|
| 42 | 42 | $className = $this->getClassName($getClassName); |
| 43 | 43 | |
| 44 | 44 | require_once ($file); |
| 45 | 45 | |
| 46 | - $capsule = new SchemaCapsule($this->config,$file,$table); |
|
| 46 | + $capsule = new SchemaCapsule($this->config, $file, $table); |
|
| 47 | 47 | |
| 48 | 48 | $this->list[$table][] = (new $className)->up($capsule); |
| 49 | 49 | } |
@@ -60,14 +60,14 @@ discard block |
||
| 60 | 60 | * @param $table |
| 61 | 61 | * @return mixed|string |
| 62 | 62 | */ |
| 63 | - public function apply($file,$table) |
|
| 63 | + public function apply($file, $table) |
|
| 64 | 64 | { |
| 65 | - $getClassName = preg_replace('@(\d+)_@is','',$file); |
|
| 65 | + $getClassName = preg_replace('@(\d+)_@is', '', $file); |
|
| 66 | 66 | $className = $this->getClassName($getClassName); |
| 67 | 67 | |
| 68 | 68 | require_once ($file); |
| 69 | 69 | |
| 70 | - $capsule = new SchemaCapsule($this->config,$file,$table); |
|
| 70 | + $capsule = new SchemaCapsule($this->config, $file, $table); |
|
| 71 | 71 | |
| 72 | 72 | $this->list[$table][] = (new $className)->up($capsule); |
| 73 | 73 | |
@@ -10,16 +10,16 @@ discard block |
||
| 10 | 10 | * @param $name |
| 11 | 11 | * @return string |
| 12 | 12 | */ |
| 13 | - protected function getNullableValue($nullable,$name) |
|
| 13 | + protected function getNullableValue($nullable, $name) |
|
| 14 | 14 | { |
| 15 | - $nullableValue=''; |
|
| 15 | + $nullableValue = ''; |
|
| 16 | 16 | |
| 17 | - if(isset($nullable[$name])){ |
|
| 18 | - if($nullable[$name]===false){ |
|
| 19 | - $nullableValue='NOT NULL'; |
|
| 17 | + if (isset($nullable[$name])) { |
|
| 18 | + if ($nullable[$name]===false) { |
|
| 19 | + $nullableValue = 'NOT NULL'; |
|
| 20 | 20 | } |
| 21 | - else{ |
|
| 22 | - $nullableValue='NULL'; |
|
| 21 | + else { |
|
| 22 | + $nullableValue = 'NULL'; |
|
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | |
@@ -59,22 +59,22 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | protected function getValueWithIsset($name) |
| 61 | 61 | { |
| 62 | - $nameKey = array_search($name,$this->data['names']); |
|
| 62 | + $nameKey = array_search($name, $this->data['names']); |
|
| 63 | 63 | |
| 64 | 64 | $list = []; |
| 65 | - $list[] = $this->getNullableValue($this->data['nullable'],$name); |
|
| 65 | + $list[] = $this->getNullableValue($this->data['nullable'], $name); |
|
| 66 | 66 | $list[] = (isset($this->data['autoIncrement'][$name])) ? 'AUTO_INCREMENT' : ''; |
| 67 | 67 | $list[] = (isset($this->data['primaryKey'][$name])) ? 'PRIMARY KEY' : ''; |
| 68 | 68 | |
| 69 | - if(isset($this->data['types'][$nameKey])){ |
|
| 70 | - if($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])){ |
|
| 69 | + if (isset($this->data['types'][$nameKey])) { |
|
| 70 | + if ($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])) { |
|
| 71 | 71 | $this->data['default'][$name] = 'CURRENT_TIMESTAMP'; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - if($this->data['types'][$nameKey]!=='timestamp'){ |
|
| 74 | + if ($this->data['types'][$nameKey]!=='timestamp') { |
|
| 75 | 75 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : ''; |
| 76 | 76 | } |
| 77 | - else{ |
|
| 77 | + else { |
|
| 78 | 78 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : ''; |
| 79 | 79 | } |
| 80 | 80 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - if(count($list)===3){ |
|
| 85 | + if (count($list)===3) { |
|
| 86 | 86 | $list[] = ''; |
| 87 | 87 | $list[] = ''; |
| 88 | 88 | } |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | protected function getUniqueValueList($name) |
| 100 | 100 | { |
| 101 | 101 | //get unique |
| 102 | - if(isset($this->data['unique'][$name])){ |
|
| 103 | - $this->data['uniqueValueList'][] = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)'; |
|
| 102 | + if (isset($this->data['unique'][$name])) { |
|
| 103 | + $this->data['uniqueValueList'][] = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)'; |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | protected function getIndexValueList($name) |
| 111 | 111 | { |
| 112 | 112 | //get index |
| 113 | - if(isset($this->data['index'][$name])){ |
|
| 114 | - $this->data['indexValueList'][] = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')'; |
|
| 113 | + if (isset($this->data['index'][$name])) { |
|
| 114 | + $this->data['indexValueList'][] = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')'; |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
@@ -132,13 +132,13 @@ discard block |
||
| 132 | 132 | */ |
| 133 | 133 | protected function getCreateDefaultList() |
| 134 | 134 | { |
| 135 | - $list = []; |
|
| 135 | + $list = []; |
|
| 136 | 136 | |
| 137 | 137 | foreach ($this->data['names'] as $key=>$name) |
| 138 | 138 | { |
| 139 | 139 | list( |
| 140 | - $nullableValue,$autoIncrementValue, |
|
| 141 | - $primaryKeyValue,$defaultValue,$commentValue |
|
| 140 | + $nullableValue, $autoIncrementValue, |
|
| 141 | + $primaryKeyValue, $defaultValue, $commentValue |
|
| 142 | 142 | ) = $this->getValueWithIsset($name); |
| 143 | 143 | |
| 144 | 144 | //set index values |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $types = (isset($this->data['types'][$key])) ? $this->data['types'][$key] : ''; |
| 148 | 148 | |
| 149 | - $list[]=''.$name.' '.$types.' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.''; |
|
| 149 | + $list[] = ''.$name.' '.$types.' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.''; |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | return $list; |
@@ -157,18 +157,18 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | protected function getKeyList() |
| 159 | 159 | { |
| 160 | - $keyList = []; |
|
| 160 | + $keyList = []; |
|
| 161 | 161 | |
| 162 | 162 | //multiple indexes |
| 163 | - if(isset($this->data['index']['indexes'])){ |
|
| 163 | + if (isset($this->data['index']['indexes'])) { |
|
| 164 | 164 | |
| 165 | - foreach ($this->data['index']['indexes'] as $index_key=>$index_value){ |
|
| 165 | + foreach ($this->data['index']['indexes'] as $index_key=>$index_value) { |
|
| 166 | 166 | |
| 167 | 167 | $indexesCommentValue = (isset($index_value['comment'])) ? 'COMMENT "'.$index_value['comment'].'"' : ''; |
| 168 | 168 | |
| 169 | 169 | $keyType = (isset($index_value['type'])) ? ucfirst($index_value['type']) : 'KEY'; |
| 170 | 170 | |
| 171 | - $keyList[] = "".$keyType." ".$index_value['name']." (".implode(",",$index_value['value']).") ".$indexesCommentValue; |
|
| 171 | + $keyList[] = "".$keyType." ".$index_value['name']." (".implode(",", $index_value['value']).") ".$indexesCommentValue; |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
@@ -183,13 +183,13 @@ discard block |
||
| 183 | 183 | { |
| 184 | 184 | $list = []; |
| 185 | 185 | |
| 186 | - foreach ($reference as $constraint=>$values){ |
|
| 186 | + foreach ($reference as $constraint=>$values) { |
|
| 187 | 187 | |
| 188 | - $list[]=',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') |
|
| 188 | + $list[] = ',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') |
|
| 189 | 189 | REFERENCES '.$values['references']['table'].'('.$values['references']['field'].') '.$this->getOnProcess($values); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | - return implode (" ",$list); |
|
| 192 | + return implode(" ", $list); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | */ |
| 198 | 198 | private function getOnProcess($referenceValue) |
| 199 | 199 | { |
| 200 | - if(isset($referenceValue['on']) && isset($referenceValue['onOption'])){ |
|
| 200 | + if (isset($referenceValue['on']) && isset($referenceValue['onOption'])) { |
|
| 201 | 201 | return ''.$referenceValue['on'].' '.strtoupper($referenceValue['onOption']).''; |
| 202 | 202 | } |
| 203 | 203 | |
@@ -17,8 +17,7 @@ discard block |
||
| 17 | 17 | if(isset($nullable[$name])){ |
| 18 | 18 | if($nullable[$name]===false){ |
| 19 | 19 | $nullableValue='NOT NULL'; |
| 20 | - } |
|
| 21 | - else{ |
|
| 20 | + } else{ |
|
| 22 | 21 | $nullableValue='NULL'; |
| 23 | 22 | } |
| 24 | 23 | } |
@@ -73,8 +72,7 @@ discard block |
||
| 73 | 72 | |
| 74 | 73 | if($this->data['types'][$nameKey]!=='timestamp'){ |
| 75 | 74 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : ''; |
| 76 | - } |
|
| 77 | - else{ |
|
| 75 | + } else{ |
|
| 78 | 76 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : ''; |
| 79 | 77 | } |
| 80 | 78 | |