@@ -9,21 +9,21 @@ discard block |
||
| 9 | 9 | * @param callable|null $callback |
| 10 | 10 | * @return mixed|null |
| 11 | 11 | */ |
| 12 | - protected function checkParamsViaAvailability($data,callable $callback=null) |
|
| 12 | + protected function checkParamsViaAvailability($data, callable $callback = null) |
|
| 13 | 13 | {
|
| 14 | - if(is_callable($data) && is_null($callback)){
|
|
| 14 | + if (is_callable($data) && is_null($callback)) {
|
|
| 15 | 15 | |
| 16 | 16 | // if an authenticate is provided via the existing check method, |
| 17 | 17 | // then we return the value of the data that we are checking for with callback help. |
| 18 | - if($this->check()){
|
|
| 18 | + if ($this->check()) {
|
|
| 19 | 19 | return call_user_func($data); |
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | // if an authenticate is provided via the existing check method, |
| 24 | 24 | // then we return the value of the data that we are checking for with callback help. |
| 25 | - if($this->check() && isset($this->params[$data])){
|
|
| 26 | - return call_user_func_array($callback,[$this->params[$data]]); |
|
| 25 | + if ($this->check() && isset($this->params[$data])) {
|
|
| 26 | + return call_user_func_array($callback, [$this->params[$data]]); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | return null; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | // we will determine whether |
| 40 | 40 | // the http path is correct for this method. |
| 41 | - if(isset($getHttp[$type]) and $getHttp[$type]!==httpMethod()){
|
|
| 41 | + if (isset($getHttp[$type]) and $getHttp[$type]!==httpMethod()) {
|
|
| 42 | 42 | $this->getExceptionForHttp($getHttp[$type]); |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | {
|
| 51 | 51 | // if there is a token in the headers, |
| 52 | 52 | // we return the callback. |
| 53 | - if(!is_null($this->getTokenSentByUser())){
|
|
| 54 | - return call_user_func_array($callback,[$this->getTokenSentByUser()]); |
|
| 53 | + if (!is_null($this->getTokenSentByUser())) {
|
|
| 54 | + return call_user_func_array($callback, [$this->getTokenSentByUser()]); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | //token false |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | /** |
| 8 | 8 | * @var null |
| 9 | 9 | */ |
| 10 | - public $credentialHash=null; |
|
| 10 | + public $credentialHash = null; |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * @return string |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | {
|
| 17 | 17 | // the absolute params property must be present |
| 18 | 18 | // in the object and the params value must be the builder key. |
| 19 | - if(property_exists($this,'params') and isset($this->params['builder'])){
|
|
| 19 | + if (property_exists($this, 'params') and isset($this->params['builder'])) {
|
|
| 20 | 20 | |
| 21 | 21 | // a real token will be generated after |
| 22 | 22 | // you get the first method of the query builder value. |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | // we refer to the token closure feature on the config to enable |
| 26 | 26 | // the creation of user-based tokens on the application side. |
| 27 | - return $this->getTokenFromProvider($authData,function() use($authData){
|
|
| 27 | + return $this->getTokenFromProvider($authData, function() use($authData){
|
|
| 28 | 28 | return md5(sha1($authData->id.'__'.$this->credentialHash.'__'.time().'__'.fingerPrint())); |
| 29 | 29 | }); |
| 30 | 30 | } |
@@ -37,11 +37,11 @@ discard block |
||
| 37 | 37 | * @param callable $callback |
| 38 | 38 | * @return mixed |
| 39 | 39 | */ |
| 40 | - private function getTokenFromProvider($authData,callable $callback) |
|
| 40 | + private function getTokenFromProvider($authData, callable $callback) |
|
| 41 | 41 | {
|
| 42 | 42 | // if the token value is a closure value, |
| 43 | 43 | // we will run a user-based token closure. |
| 44 | - if(app()->has('authenticate.token') && is_callable($token = app()->get('authenticate.token'))){
|
|
| 44 | + if (app()->has('authenticate.token') && is_callable($token = app()->get('authenticate.token'))) {
|
|
| 45 | 45 | return $token($authData); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -19,19 +19,19 @@ discard block |
||
| 19 | 19 | * @param $command |
| 20 | 20 | * @param $args |
| 21 | 21 | */ |
| 22 | - public function __construct($app,$command,$args) |
|
| 22 | + public function __construct($app, $command, $args) |
|
| 23 | 23 | {
|
| 24 | 24 | parent::__construct($app); |
| 25 | 25 | |
| 26 | 26 | $this->arguments[] = 'php'; |
| 27 | 27 | $this->arguments[] = 'api'; |
| 28 | - $this->arguments = array_merge($this->arguments,explode(" ",$command));
|
|
| 28 | + $this->arguments = array_merge($this->arguments, explode(" ", $command));
|
|
| 29 | 29 | $this->arguments[] = strtolower(app); |
| 30 | 30 | |
| 31 | - $argsList = explode(' ',$args);
|
|
| 31 | + $argsList = explode(' ', $args);
|
|
| 32 | 32 | |
| 33 | 33 | foreach ($argsList as $item) {
|
| 34 | - $this->arguments[] = $item; |
|
| 34 | + $this->arguments[] = $item; |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | |
@@ -42,11 +42,11 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function handle() |
| 44 | 44 | {
|
| 45 | - $process = new ProcessHandler($this->arguments,root.''); |
|
| 45 | + $process = new ProcessHandler($this->arguments, root.''); |
|
| 46 | 46 | $process->start(); |
| 47 | 47 | |
| 48 | 48 | foreach ($process as $type => $data) {
|
| 49 | - if ($process::OUT !== $type) {
|
|
| 49 | + if ($process::OUT!==$type) {
|
|
| 50 | 50 | return false; |
| 51 | 51 | } |
| 52 | 52 | return true; |
@@ -55,7 +55,9 @@ |
||
| 55 | 55 | |
| 56 | 56 | $patternCount = $this->getPatternRealCount($pattern); |
| 57 | 57 | |
| 58 | - if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList); |
|
| 58 | + if(count($urlRoute)==0 && count($urlRoute)==0) {
|
|
| 59 | + return array_key_first($patternList); |
|
| 60 | + } |
|
| 59 | 61 | |
| 60 | 62 | if(isset($patternCount['optional'])){ |
| 61 | 63 | $optionalCount = count($patternCount['default']) + count($patternCount['optional']); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | * @param ApplicationContracts $app |
| 19 | 19 | * @param null|object $route |
| 20 | 20 | */ |
| 21 | - public function __construct(ApplicationContracts $app, $route=null) |
|
| 21 | + public function __construct(ApplicationContracts $app, $route = null) |
|
| 22 | 22 | { |
| 23 | 23 | parent::__construct($app); |
| 24 | 24 | |
@@ -34,53 +34,53 @@ discard block |
||
| 34 | 34 | { |
| 35 | 35 | $routes = $this->route->getRoutes(); |
| 36 | 36 | |
| 37 | - if(!isset($routes['pattern'])){ |
|
| 37 | + if (!isset($routes['pattern'])) { |
|
| 38 | 38 | return []; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | $patterns = $routes['pattern']; |
| 42 | - $urlRoute = array_filter(route(),'strlen'); |
|
| 42 | + $urlRoute = array_filter(route(), 'strlen'); |
|
| 43 | 43 | |
| 44 | 44 | $patternList = []; |
| 45 | 45 | |
| 46 | - foreach($routes['data'] as $patternKey=>$routeData){ |
|
| 47 | - if($routeData['http']==httpMethod()){ |
|
| 48 | - $patternList[$patternKey]=$patterns[$patternKey]; |
|
| 46 | + foreach ($routes['data'] as $patternKey=>$routeData) { |
|
| 47 | + if ($routeData['http']==httpMethod()) { |
|
| 48 | + $patternList[$patternKey] = $patterns[$patternKey]; |
|
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | $scoredList = []; |
| 53 | 53 | |
| 54 | - foreach ($patternList as $key=>$pattern){ |
|
| 54 | + foreach ($patternList as $key=>$pattern) { |
|
| 55 | 55 | |
| 56 | 56 | $patternCount = $this->getPatternRealCount($pattern); |
| 57 | 57 | |
| 58 | - if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList); |
|
| 58 | + if (count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList); |
|
| 59 | 59 | |
| 60 | - if(isset($patternCount['optional'])){ |
|
| 61 | - $optionalCount = count($patternCount['default']) + count($patternCount['optional']); |
|
| 60 | + if (isset($patternCount['optional'])) { |
|
| 61 | + $optionalCount = count($patternCount['default'])+count($patternCount['optional']); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if(count($urlRoute) == count($patternCount['default']) || |
|
| 64 | + if (count($urlRoute)==count($patternCount['default']) || |
|
| 65 | 65 | (isset($optionalCount) && count($urlRoute)>count($patternCount['default']) && $optionalCount>=count($urlRoute)) |
| 66 | - ){ |
|
| 66 | + ) { |
|
| 67 | 67 | |
| 68 | - foreach ($pattern as $pkey=>$item){ |
|
| 68 | + foreach ($pattern as $pkey=>$item) { |
|
| 69 | 69 | |
| 70 | - if($this->route->isMatchVaribleRegexPattern($item)===false){ |
|
| 71 | - if(isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item){ |
|
| 70 | + if ($this->route->isMatchVaribleRegexPattern($item)===false) { |
|
| 71 | + if (isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item) { |
|
| 72 | 72 | $scoredList[$key][] = 3; |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - if($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)){ |
|
| 77 | - if(isset($urlRoute[$pkey])){ |
|
| 76 | + if ($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)) { |
|
| 77 | + if (isset($urlRoute[$pkey])) { |
|
| 78 | 78 | $scoredList[$key][] = 2; |
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - if($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)){ |
|
| 83 | - if(isset($urlRoute[$pkey])){ |
|
| 82 | + if ($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)) { |
|
| 83 | + if (isset($urlRoute[$pkey])) { |
|
| 84 | 84 | $scoredList[$key][] = 1; |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -104,14 +104,14 @@ discard block |
||
| 104 | 104 | $list = []; |
| 105 | 105 | $list['default'] = []; |
| 106 | 106 | |
| 107 | - foreach ($pattern as $key=>$value){ |
|
| 108 | - if(($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value) |
|
| 109 | - && !$this->route->isOptionalVaribleRegexPattern($value))){ |
|
| 107 | + foreach ($pattern as $key=>$value) { |
|
| 108 | + if (($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value) |
|
| 109 | + && !$this->route->isOptionalVaribleRegexPattern($value))) { |
|
| 110 | 110 | $list['default'][$key] = $value; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - if(($this->route->isMatchVaribleRegexPattern($value) |
|
| 114 | - && $this->route->isOptionalVaribleRegexPattern($value))){ |
|
| 113 | + if (($this->route->isMatchVaribleRegexPattern($value) |
|
| 114 | + && $this->route->isOptionalVaribleRegexPattern($value))) { |
|
| 115 | 115 | $list['optional'][] = true; |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -125,19 +125,19 @@ discard block |
||
| 125 | 125 | * @param array $scoredList |
| 126 | 126 | * @return false|int|string |
| 127 | 127 | */ |
| 128 | - private function showKeyAccordingToScoredList($scoredList=array()) |
|
| 128 | + private function showKeyAccordingToScoredList($scoredList = array()) |
|
| 129 | 129 | { |
| 130 | 130 | $scored = []; |
| 131 | 131 | |
| 132 | - foreach($scoredList as $key=>$item){ |
|
| 132 | + foreach ($scoredList as $key=>$item) { |
|
| 133 | 133 | $scored[$key] = array_sum($item); |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - if(count($scored)){ |
|
| 136 | + if (count($scored)) { |
|
| 137 | 137 | $arrayCountValues = array_count_values($scored); |
| 138 | 138 | |
| 139 | - if($arrayCountValues[max($scored)]==1){ |
|
| 140 | - return array_search(max($scored),$scored); |
|
| 139 | + if ($arrayCountValues[max($scored)]==1) { |
|
| 140 | + return array_search(max($scored), $scored); |
|
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | |
@@ -156,8 +156,8 @@ discard block |
||
| 156 | 156 | $route = route(); |
| 157 | 157 | |
| 158 | 158 | foreach ($pattern as $key=>$item) { |
| 159 | - if($this->route->isMatchVaribleRegexPattern($item)===false){ |
|
| 160 | - if(isset($route[$key]) && $item!==$route[$key]){ |
|
| 159 | + if ($this->route->isMatchVaribleRegexPattern($item)===false) { |
|
| 160 | + if (isset($route[$key]) && $item!==$route[$key]) { |
|
| 161 | 161 | return false; |
| 162 | 162 | } |
| 163 | 163 | } |
@@ -36,11 +36,11 @@ discard block |
||
| 36 | 36 | * @param null|string $method |
| 37 | 37 | * @return array |
| 38 | 38 | */ |
| 39 | - public static function getRoutes($method=null) : array |
|
| 39 | + public static function getRoutes($method = null) : array |
|
| 40 | 40 | {
|
| 41 | 41 | // it collects and |
| 42 | 42 | // executes route data in an array. |
| 43 | - if(is_null($method)){
|
|
| 43 | + if (is_null($method)) {
|
|
| 44 | 44 | return static::$routes; |
| 45 | 45 | } |
| 46 | 46 | |
@@ -48,16 +48,16 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $routes = self::getRoutes(); |
| 50 | 50 | |
| 51 | - if(isset($routes['data'])){
|
|
| 52 | - foreach ($routes['data'] as $key=>$item){
|
|
| 53 | - if($item['http']==httpMethod()){
|
|
| 51 | + if (isset($routes['data'])) {
|
|
| 52 | + foreach ($routes['data'] as $key=>$item) {
|
|
| 53 | + if ($item['http']==httpMethod()) {
|
|
| 54 | 54 | $httpRouteList['data'][$key] = $item; |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - if(isset($routes['pattern'],$httpRouteList['data'])){
|
|
| 60 | - foreach ($httpRouteList['data'] as $key=>$item){
|
|
| 59 | + if (isset($routes['pattern'], $httpRouteList['data'])) {
|
|
| 60 | + foreach ($httpRouteList['data'] as $key=>$item) {
|
|
| 61 | 61 | $httpRouteList['pattern'][$key] = $routes['pattern'][$key]; |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | {
|
| 75 | 75 | // detects where the route path is coming from |
| 76 | 76 | // and returns this data in the static path. |
| 77 | - $trace = Utils::trace(2,'file'); |
|
| 77 | + $trace = Utils::trace(2, 'file'); |
|
| 78 | 78 | |
| 79 | 79 | // the trace is returned if the variable is available |
| 80 | 80 | // in the path data, otherwise it returns null. |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | // with query we bind the returned values to the params property of the auth object. |
| 55 | 55 | // and so the auth object will make a final return with these values. |
| 56 | - $this->paramValues('check',$query);
|
|
| 56 | + $this->paramValues('check', $query);
|
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -66,16 +66,16 @@ discard block |
||
| 66 | 66 | {
|
| 67 | 67 | // using the driver object we write the query builder statement. |
| 68 | 68 | // we do the values of the query with the credentials that are sent. |
| 69 | - if(!is_null($provider = $this->auth->provider('login'))){
|
|
| 69 | + if (!is_null($provider = $this->auth->provider('login'))) {
|
|
| 70 | 70 | $query = $provider($credentials->get()); |
| 71 | 71 | } |
| 72 | - else{
|
|
| 72 | + else {
|
|
| 73 | 73 | $query = $this->setQuery($credentials); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | // with query we bind the returned values to the params property of the auth object. |
| 77 | 77 | // and so the auth object will make a final return with these values. |
| 78 | - $this->paramValues('login',$query);
|
|
| 78 | + $this->paramValues('login', $query);
|
|
| 79 | 79 | |
| 80 | 80 | // we assign the credential hash value |
| 81 | 81 | // to the global of the authenticate object. |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | // we update the token value. |
| 86 | 86 | $this->updateToken(); |
| 87 | 87 | |
| 88 | - if(isset($this->auth->params['authToken'])){
|
|
| 88 | + if (isset($this->auth->params['authToken'])) {
|
|
| 89 | 89 | $this->saveDeviceToken(); |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -104,18 +104,18 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | // with query we bind the returned values to the params property of the auth object. |
| 106 | 106 | // and so the auth object will make a final return with these values. |
| 107 | - $this->paramValues('logout',$query);
|
|
| 107 | + $this->paramValues('logout', $query);
|
|
| 108 | 108 | |
| 109 | 109 | //token updating as null |
| 110 | - if(isset($this->auth->params['authToken'])){
|
|
| 111 | - if(!$this->deleteDeviceToken()){
|
|
| 110 | + if (isset($this->auth->params['authToken'])) {
|
|
| 111 | + if (!$this->deleteDeviceToken()) {
|
|
| 112 | 112 | $this->auth->params['status'] = 0; |
| 113 | 113 | $this->auth->params['exception'] = 'logoutInternal'; |
| 114 | 114 | return false; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - if($this->auth->params['status']===0){
|
|
| 118 | + if ($this->auth->params['status']===0) {
|
|
| 119 | 119 | $this->auth->params['exception'] = 'logoutException'; |
| 120 | 120 | } |
| 121 | 121 | } |
@@ -68,8 +68,7 @@ |
||
| 68 | 68 | // we do the values of the query with the credentials that are sent. |
| 69 | 69 | if(!is_null($provider = $this->auth->provider('login'))){
|
| 70 | 70 | $query = $provider($credentials->get()); |
| 71 | - } |
|
| 72 | - else{
|
|
| 71 | + } else{
|
|
| 73 | 72 | $query = $this->setQuery($credentials); |
| 74 | 73 | } |
| 75 | 74 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * @param $file |
| 38 | 38 | * @param $table |
| 39 | 39 | */ |
| 40 | - public function __construct($config,$file,$table) |
|
| 40 | + public function __construct($config, $file, $table) |
|
| 41 | 41 | { |
| 42 | 42 | $this->config = $config; |
| 43 | 43 | $this->file = $file; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function alter(callable $callback) |
| 54 | 54 | { |
| 55 | - return $this->callbackWizardInstance(__FUNCTION__,$callback); |
|
| 55 | + return $this->callbackWizardInstance(__FUNCTION__, $callback); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public function create(callable $callback) |
| 63 | 63 | { |
| 64 | - return $this->callbackWizardInstance(__FUNCTION__,$callback); |
|
| 64 | + return $this->callbackWizardInstance(__FUNCTION__, $callback); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | private function checkErrors($wizard) |
| 71 | 71 | { |
| 72 | 72 | $alterType = $wizard->getAlterType(); |
| 73 | - if(count($wizard->getNames())!==count($wizard->getTypes()) && (isset($alterType['group'])) && $alterType['group']!=='dropColumn'){ |
|
| 73 | + if (count($wizard->getNames())!==count($wizard->getTypes()) && (isset($alterType['group'])) && $alterType['group']!=='dropColumn') { |
|
| 74 | 74 | $wizard->setError('name and types are not equal'); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -106,11 +106,11 @@ discard block |
||
| 106 | 106 | * @param $method |
| 107 | 107 | * @return string |
| 108 | 108 | */ |
| 109 | - private function callbackWizardInstance($method,callable $callback) |
|
| 109 | + private function callbackWizardInstance($method, callable $callback) |
|
| 110 | 110 | { |
| 111 | 111 | $wizardInstance = $this->getWizardInstance($method); |
| 112 | 112 | |
| 113 | - $callbackReturn = call_user_func_array($callback,[$wizardInstance]); |
|
| 113 | + $callbackReturn = call_user_func_array($callback, [$wizardInstance]); |
|
| 114 | 114 | |
| 115 | 115 | $this->checkErrors($wizardInstance); |
| 116 | 116 | |
@@ -94,8 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | if(current($syntaxList)!==$changeAbleField){ |
| 96 | 96 | $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).' '.implode(' ',array_splice($syntaxList,1)).' '.$placeList; |
| 97 | - } |
|
| 98 | - else{ |
|
| 97 | + } else{ |
|
| 99 | 98 | $alterSytanx = 'ALTER TABLE '.$this->table.' modify '.$syntax.' '.$placeList; |
| 100 | 99 | } |
| 101 | 100 | |
@@ -167,8 +166,7 @@ discard block |
||
| 167 | 166 | //get table collation |
| 168 | 167 | if(isset($this->data['tableCollation']['table'])){ |
| 169 | 168 | $this->syntax[]=' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table']; |
| 170 | - } |
|
| 171 | - else{ |
|
| 169 | + } else{ |
|
| 172 | 170 | $this->syntax[]=' DEFAULT CHARACTER SET utf8'; |
| 173 | 171 | } |
| 174 | 172 | |
@@ -176,8 +174,7 @@ discard block |
||
| 176 | 174 | if($this->data['engine']!==null) |
| 177 | 175 | { |
| 178 | 176 | $this->syntax[]=' ENGINE='.$this->data['engine'].' '; |
| 179 | - } |
|
| 180 | - else{ |
|
| 177 | + } else{ |
|
| 181 | 178 | $this->syntax[]=' ENGINE=InnoDB '; |
| 182 | 179 | } |
| 183 | 180 | |
@@ -185,8 +182,7 @@ discard block |
||
| 185 | 182 | |
| 186 | 183 | if(in_array($this->table,$existTables)){ |
| 187 | 184 | return false; |
| 188 | - } |
|
| 189 | - else{ |
|
| 185 | + } else{ |
|
| 190 | 186 | $query=$this->schema->getConnection()->setQueryBasic($syntax); |
| 191 | 187 | |
| 192 | 188 | return [ |
@@ -211,8 +207,7 @@ discard block |
||
| 211 | 207 | |
| 212 | 208 | if($group=='create'){ |
| 213 | 209 | $this->syntax[]=','.implode(',',$this->data['uniqueValueList']); |
| 214 | - } |
|
| 215 | - else{ |
|
| 210 | + } else{ |
|
| 216 | 211 | $this->alterExtras[]='ADD '.implode(',',$this->data['uniqueValueList']); |
| 217 | 212 | } |
| 218 | 213 | |
@@ -223,8 +218,7 @@ discard block |
||
| 223 | 218 | |
| 224 | 219 | if($group=='create'){ |
| 225 | 220 | $this->syntax[]=','.implode(',',$this->data['indexValueList']); |
| 226 | - } |
|
| 227 | - else{ |
|
| 221 | + } else{ |
|
| 228 | 222 | $this->alterExtras[]='ADD '.implode(',',$this->data['indexValueList']); |
| 229 | 223 | } |
| 230 | 224 | |
@@ -32,25 +32,25 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | private function addColumn($alterType) |
| 34 | 34 | { |
| 35 | - if(isset($alterType['place'])){ |
|
| 35 | + if (isset($alterType['place'])) { |
|
| 36 | 36 | |
| 37 | 37 | |
| 38 | - foreach ($alterType['place'] as $placeKey=>$placeValue){ |
|
| 39 | - $placeList=$placeKey .' '.$placeValue.''; |
|
| 38 | + foreach ($alterType['place'] as $placeKey=>$placeValue) { |
|
| 39 | + $placeList = $placeKey.' '.$placeValue.''; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - $syntax = implode("",$this->syntax); |
|
| 42 | + $syntax = implode("", $this->syntax); |
|
| 43 | 43 | |
| 44 | 44 | $alterSytanx = 'ALTER TABLE '.$this->table.' ADD COLUMN '.$syntax.' '.$placeList; |
| 45 | 45 | |
| 46 | - $query=$this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 46 | + $query = $this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 47 | 47 | |
| 48 | - if(count($this->alterExtras)){ |
|
| 49 | - foreach($this->alterExtras as $extra){ |
|
| 48 | + if (count($this->alterExtras)) { |
|
| 49 | + foreach ($this->alterExtras as $extra) { |
|
| 50 | 50 | |
| 51 | 51 | $extraSyntax = 'ALTER TABLE '.$this->table.' '.$extra.''; |
| 52 | 52 | |
| 53 | - $query=$this->schema->getConnection()->setQueryBasic($extraSyntax); |
|
| 53 | + $query = $this->schema->getConnection()->setQueryBasic($extraSyntax); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -74,40 +74,40 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | private function change($alterType) |
| 76 | 76 | { |
| 77 | - if(isset($alterType['place'])){ |
|
| 77 | + if (isset($alterType['place'])) { |
|
| 78 | 78 | |
| 79 | - foreach ($alterType['place'] as $placeKey=>$placeValue){ |
|
| 80 | - $placeList=$placeKey .' '.$placeValue.''; |
|
| 79 | + foreach ($alterType['place'] as $placeKey=>$placeValue) { |
|
| 80 | + $placeList = $placeKey.' '.$placeValue.''; |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - $syntax = implode("",$this->syntax); |
|
| 83 | + $syntax = implode("", $this->syntax); |
|
| 84 | 84 | |
| 85 | 85 | $columns = $this->schema->getConnection()->showColumnsFrom($this->table); |
| 86 | 86 | |
| 87 | - foreach ($columns as $columnKey=>$columnData){ |
|
| 88 | - if($columnData['Field']==$placeValue){ |
|
| 87 | + foreach ($columns as $columnKey=>$columnData) { |
|
| 88 | + if ($columnData['Field']==$placeValue) { |
|
| 89 | 89 | $changeAbleField = $columns[$columnKey+1]['Field']; |
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - $syntaxList = explode(' ',$syntax); |
|
| 93 | + $syntaxList = explode(' ', $syntax); |
|
| 94 | 94 | |
| 95 | - if(current($syntaxList)!==$changeAbleField){ |
|
| 96 | - $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).' '.implode(' ',array_splice($syntaxList,1)).' '.$placeList; |
|
| 95 | + if (current($syntaxList)!==$changeAbleField) { |
|
| 96 | + $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).' '.implode(' ', array_splice($syntaxList, 1)).' '.$placeList; |
|
| 97 | 97 | } |
| 98 | - else{ |
|
| 98 | + else { |
|
| 99 | 99 | $alterSytanx = 'ALTER TABLE '.$this->table.' modify '.$syntax.' '.$placeList; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | |
| 103 | - $query=$this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 103 | + $query = $this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 104 | 104 | |
| 105 | - if(count($this->alterExtras)){ |
|
| 106 | - foreach($this->alterExtras as $extra){ |
|
| 105 | + if (count($this->alterExtras)) { |
|
| 106 | + foreach ($this->alterExtras as $extra) { |
|
| 107 | 107 | |
| 108 | 108 | $extraSyntax = 'ALTER TABLE '.$this->table.' '.$extra.''; |
| 109 | 109 | |
| 110 | - $query=$this->schema->getConnection()->setQueryBasic($extraSyntax); |
|
| 110 | + $query = $this->schema->getConnection()->setQueryBasic($extraSyntax); |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | |
@@ -129,17 +129,17 @@ discard block |
||
| 129 | 129 | */ |
| 130 | 130 | private function addIndex($alterType) |
| 131 | 131 | { |
| 132 | - if(isset($this->syntax[0])){ |
|
| 132 | + if (isset($this->syntax[0])) { |
|
| 133 | 133 | |
| 134 | 134 | $index = $this->syntax[0]; |
| 135 | 135 | |
| 136 | - foreach($index as $name=>$item){ |
|
| 136 | + foreach ($index as $name=>$item) { |
|
| 137 | 137 | $index_name = $name; |
| 138 | - $indexes = implode(',',$item); |
|
| 138 | + $indexes = implode(',', $item); |
|
| 139 | 139 | } |
| 140 | 140 | $alterSytanx = 'create index '.$index_name.' on '.$this->table.' ('.$indexes.')'; |
| 141 | 141 | |
| 142 | - $query=$this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 142 | + $query = $this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 143 | 143 | |
| 144 | 144 | return [ |
| 145 | 145 | 'syntax'=>$this->syntax, |
@@ -160,17 +160,17 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | private function addUnique($alterType) |
| 162 | 162 | { |
| 163 | - if(isset($this->syntax[0])){ |
|
| 163 | + if (isset($this->syntax[0])) { |
|
| 164 | 164 | |
| 165 | 165 | $unique = $this->syntax[0]; |
| 166 | 166 | |
| 167 | - foreach($unique as $name=>$item){ |
|
| 167 | + foreach ($unique as $name=>$item) { |
|
| 168 | 168 | $unique_name = $name; |
| 169 | - $uniques = implode(',',$item); |
|
| 169 | + $uniques = implode(',', $item); |
|
| 170 | 170 | } |
| 171 | 171 | $alterSytanx = 'ALTER TABLE '.$this->table.' ADD CONSTRAINT '.$unique_name.' UNIQUE ('.$uniques.')'; |
| 172 | 172 | |
| 173 | - $query=$this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 173 | + $query = $this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 174 | 174 | |
| 175 | 175 | return [ |
| 176 | 176 | 'syntax'=>$this->syntax, |
@@ -191,13 +191,13 @@ discard block |
||
| 191 | 191 | */ |
| 192 | 192 | private function dropColumn($alterType) |
| 193 | 193 | { |
| 194 | - if(isset($this->syntax[0])){ |
|
| 194 | + if (isset($this->syntax[0])) { |
|
| 195 | 195 | |
| 196 | 196 | $column = rtrim($this->syntax[0]); |
| 197 | 197 | |
| 198 | 198 | $alterSytanx = 'alter table '.$this->table.' drop column '.$column; |
| 199 | 199 | |
| 200 | - $query=$this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 200 | + $query = $this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 201 | 201 | |
| 202 | 202 | return [ |
| 203 | 203 | 'syntax'=>$this->syntax, |
@@ -218,15 +218,15 @@ discard block |
||
| 218 | 218 | */ |
| 219 | 219 | private function dropKey($alterType) |
| 220 | 220 | { |
| 221 | - if(isset($this->syntax[0])){ |
|
| 221 | + if (isset($this->syntax[0])) { |
|
| 222 | 222 | |
| 223 | 223 | $dropKey = $this->syntax[0]; |
| 224 | 224 | |
| 225 | - foreach ($dropKey as $dropType=>$dropName){ |
|
| 225 | + foreach ($dropKey as $dropType=>$dropName) { |
|
| 226 | 226 | |
| 227 | 227 | $alterSytanx = 'alter table '.$this->table.' drop '.$dropType.' '.$dropName; |
| 228 | 228 | |
| 229 | - $query=$this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 229 | + $query = $this->schema->getConnection()->setQueryBasic($alterSytanx); |
|
| 230 | 230 | |
| 231 | 231 | return [ |
| 232 | 232 | 'syntax'=>$this->syntax, |
@@ -256,32 +256,32 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | $this->getDefaultSyntaxGroup(); |
| 258 | 258 | |
| 259 | - $this->syntax[]=')'; |
|
| 259 | + $this->syntax[] = ')'; |
|
| 260 | 260 | |
| 261 | 261 | //get table collation |
| 262 | - if(isset($this->data['tableCollation']['table'])){ |
|
| 263 | - $this->syntax[]=' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table']; |
|
| 262 | + if (isset($this->data['tableCollation']['table'])) { |
|
| 263 | + $this->syntax[] = ' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table']; |
|
| 264 | 264 | } |
| 265 | - else{ |
|
| 266 | - $this->syntax[]=' DEFAULT CHARACTER SET utf8'; |
|
| 265 | + else { |
|
| 266 | + $this->syntax[] = ' DEFAULT CHARACTER SET utf8'; |
|
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | //get engine |
| 270 | - if($this->data['engine']!==null) |
|
| 270 | + if ($this->data['engine']!==null) |
|
| 271 | 271 | { |
| 272 | - $this->syntax[]=' ENGINE='.$this->data['engine'].' '; |
|
| 272 | + $this->syntax[] = ' ENGINE='.$this->data['engine'].' '; |
|
| 273 | 273 | } |
| 274 | - else{ |
|
| 275 | - $this->syntax[]=' ENGINE=InnoDB '; |
|
| 274 | + else { |
|
| 275 | + $this->syntax[] = ' ENGINE=InnoDB '; |
|
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - $syntax = implode("",$this->syntax); |
|
| 278 | + $syntax = implode("", $this->syntax); |
|
| 279 | 279 | |
| 280 | - if(in_array($this->table,$existTables)){ |
|
| 280 | + if (in_array($this->table, $existTables)) { |
|
| 281 | 281 | return false; |
| 282 | 282 | } |
| 283 | - else{ |
|
| 284 | - $query=$this->schema->getConnection()->setQueryBasic($syntax); |
|
| 283 | + else { |
|
| 284 | + $query = $this->schema->getConnection()->setQueryBasic($syntax); |
|
| 285 | 285 | |
| 286 | 286 | return [ |
| 287 | 287 | 'syntax'=>$syntax, |
@@ -296,52 +296,52 @@ discard block |
||
| 296 | 296 | /** |
| 297 | 297 | * @param null $group |
| 298 | 298 | */ |
| 299 | - private function getDefaultSyntaxGroup($group=null) |
|
| 299 | + private function getDefaultSyntaxGroup($group = null) |
|
| 300 | 300 | { |
| 301 | - $this->syntax[] = implode(",",$this->getCreateDefaultList()); |
|
| 301 | + $this->syntax[] = implode(",", $this->getCreateDefaultList()); |
|
| 302 | 302 | |
| 303 | 303 | //get unique values |
| 304 | - if(isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])){ |
|
| 304 | + if (isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])) { |
|
| 305 | 305 | |
| 306 | - if($group=='create'){ |
|
| 307 | - $this->syntax[]=','.implode(',',$this->data['uniqueValueList']); |
|
| 306 | + if ($group=='create') { |
|
| 307 | + $this->syntax[] = ','.implode(',', $this->data['uniqueValueList']); |
|
| 308 | 308 | } |
| 309 | - else{ |
|
| 310 | - $this->alterExtras[]='ADD '.implode(',',$this->data['uniqueValueList']); |
|
| 309 | + else { |
|
| 310 | + $this->alterExtras[] = 'ADD '.implode(',', $this->data['uniqueValueList']); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | //get index values |
| 316 | - if(isset($this->data['indexValueList']) && count($this->data['indexValueList'])){ |
|
| 316 | + if (isset($this->data['indexValueList']) && count($this->data['indexValueList'])) { |
|
| 317 | 317 | |
| 318 | - if($group=='create'){ |
|
| 319 | - $this->syntax[]=','.implode(',',$this->data['indexValueList']); |
|
| 318 | + if ($group=='create') { |
|
| 319 | + $this->syntax[] = ','.implode(',', $this->data['indexValueList']); |
|
| 320 | 320 | } |
| 321 | - else{ |
|
| 322 | - $this->alterExtras[]='ADD '.implode(',',$this->data['indexValueList']); |
|
| 321 | + else { |
|
| 322 | + $this->alterExtras[] = 'ADD '.implode(',', $this->data['indexValueList']); |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | //get index values for key |
| 328 | - if(count($this->getKeyList())){ |
|
| 329 | - $this->syntax[]=','.implode(',',$this->getKeyList()); |
|
| 328 | + if (count($this->getKeyList())) { |
|
| 329 | + $this->syntax[] = ','.implode(',', $this->getKeyList()); |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - if(count($this->data['references'])){ |
|
| 333 | - $this->syntax[]=$this->getReferenceSyntax($this->data['references']); |
|
| 332 | + if (count($this->data['references'])) { |
|
| 333 | + $this->syntax[] = $this->getReferenceSyntax($this->data['references']); |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | - if(isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addIndex'){ |
|
| 336 | + if (isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addIndex') { |
|
| 337 | 337 | $this->syntax[0] = $this->data['index']; |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | - if(isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addUnique'){ |
|
| 340 | + if (isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addUnique') { |
|
| 341 | 341 | $this->syntax[0] = $this->data['unique']; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - if(isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='dropKey'){ |
|
| 344 | + if (isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='dropKey') { |
|
| 345 | 345 | $this->syntax[0] = $this->data['key']; |
| 346 | 346 | } |
| 347 | 347 | } |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | use Migratio\Contract\WizardContract; |
| 6 | 6 | use Migratio\Contract\WizardAlterContract; |
| 7 | 7 | |
| 8 | -class WizardAlter extends Wizard implements WizardContract,WizardAlterContract |
|
| 8 | +class WizardAlter extends Wizard implements WizardContract, WizardAlterContract |
|
| 9 | 9 | { |
| 10 | 10 | /** |
| 11 | 11 | * @var array |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public function after($field) |
| 34 | 34 | { |
| 35 | - $this->wizard->setAlterType('place',['AFTER'=>$field]); |
|
| 35 | + $this->wizard->setAlterType('place', ['AFTER'=>$field]); |
|
| 36 | 36 | |
| 37 | 37 | return $this->wizard; |
| 38 | 38 | } |