php-resta /
resta-core
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | public static function getInstance() |
| 18 | 18 | { |
| 19 | - if(is_null(self::$singleton)){ |
|
| 19 | + if (is_null(self::$singleton)) { |
|
| 20 | 20 | self::$singleton = new Serializer(); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public static function set($data) |
| 32 | 32 | { |
| 33 | - if(is_callable($data)){ |
|
| 33 | + if (is_callable($data)) { |
|
| 34 | 34 | return self::getInstance()->serialize($data); |
| 35 | 35 | } |
| 36 | 36 | return self::getInstance()->serialize(function() use ($data){ |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @param $credentials |
| 32 | 32 | * @param null|AuthLoginManager $manager |
| 33 | 33 | */ |
| 34 | - public function __construct($credentials,$manager) |
|
| 34 | + public function __construct($credentials, $manager) |
|
| 35 | 35 | {
|
| 36 | 36 | //get credentials as default |
| 37 | 37 | $this->credentials = $credentials; |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | //get credential hash |
| 43 | 43 | $this->setCredentialHash(); |
| 44 | 44 | |
| 45 | - if($this->manager->getUsing()===false){
|
|
| 45 | + if ($this->manager->getUsing()===false) {
|
|
| 46 | 46 | |
| 47 | 47 | // the request object will help you process |
| 48 | 48 | // the credentials and get them correctly. |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function getRequest() |
| 94 | 94 | {
|
| 95 | - if(!is_null($clientProvider = $this->manager->getAuth()->provider('client'))){
|
|
| 95 | + if (!is_null($clientProvider = $this->manager->getAuth()->provider('client'))) {
|
|
| 96 | 96 | return $clientProvider(); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $request = $this->manager->getAuth()->getRequest(); |
| 100 | 100 | |
| 101 | - if($request=='Default'){
|
|
| 101 | + if ($request=='Default') {
|
|
| 102 | 102 | return new AuthenticateRequest($this); |
| 103 | 103 | } |
| 104 | 104 | |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | private function setCredentialHash() |
| 127 | 127 | {
|
| 128 | 128 | //set credential hash |
| 129 | - if(count($this->credentials)){
|
|
| 130 | - $this->credentialHash = md5(sha1(implode("|",$this->credentials)));
|
|
| 129 | + if (count($this->credentials)) {
|
|
| 130 | + $this->credentialHash = md5(sha1(implode("|", $this->credentials)));
|
|
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | \ No newline at end of file |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | $this->credentials = $credentials; |
| 45 | 45 | |
| 46 | 46 | //credentials loop for expected property |
| 47 | - foreach ($this->credentials->get() as $credential){
|
|
| 47 | + foreach ($this->credentials->get() as $credential) {
|
|
| 48 | 48 | $this->capsule[] = $credential; |
| 49 | 49 | $this->expected[] = $credential; |
| 50 | 50 | } |
@@ -84,8 +84,9 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | /* Read the data 1 KB at a time |
| 86 | 86 | and write to the file */ |
| 87 | - while ($chunk = fread($putdata, 1024)) |
|
| 88 | - $raw_data .= $chunk; |
|
| 87 | + while ($chunk = fread($putdata, 1024)) {
|
|
| 88 | + $raw_data .= $chunk; |
|
| 89 | + } |
|
| 89 | 90 | |
| 90 | 91 | /* Close the streams */ |
| 91 | 92 | fclose($putdata); |
@@ -105,7 +106,9 @@ discard block |
||
| 105 | 106 | |
| 106 | 107 | foreach ($parts as $part) {
|
| 107 | 108 | // If this is the last part, break |
| 108 | - if ($part == "--\r\n") break; |
|
| 109 | + if ($part == "--\r\n") {
|
|
| 110 | + break; |
|
| 111 | + } |
|
| 109 | 112 | |
| 110 | 113 | // Separate content from headers |
| 111 | 114 | $part = ltrim($part, "\r\n"); |
@@ -38,26 +38,26 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function resolve() |
| 40 | 40 | {
|
| 41 | - if($this->app->has('clientReset')){
|
|
| 41 | + if ($this->app->has('clientReset')) {
|
|
| 42 | 42 | $this->app->terminate('clientReset');
|
| 43 | 43 | return []; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | $inputs = $this->app->get($this->method); |
| 47 | 47 | |
| 48 | - $content = json_decode($this->app['request']->getContent(),1); |
|
| 48 | + $content = json_decode($this->app['request']->getContent(), 1); |
|
| 49 | 49 | |
| 50 | - if(is_array($inputs) && count($inputs)){
|
|
| 50 | + if (is_array($inputs) && count($inputs)) {
|
|
| 51 | 51 | |
| 52 | - if(isset($inputs[$this->client->getClientName()])){
|
|
| 52 | + if (isset($inputs[$this->client->getClientName()])) {
|
|
| 53 | 53 | return $inputs[$this->client->getClientName()]; |
| 54 | 54 | } |
| 55 | 55 | return $inputs; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - if(is_array($content)){
|
|
| 58 | + if (is_array($content)) {
|
|
| 59 | 59 | |
| 60 | - if(isset($content[$this->client->getClientName()])){
|
|
| 60 | + if (isset($content[$this->client->getClientName()])) {
|
|
| 61 | 61 | return $content[$this->client->getClientName()]; |
| 62 | 62 | } |
| 63 | 63 | return $content; |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | $this->inputVars(); |
| 67 | 67 | |
| 68 | - if(is_array($GLOBALS[ '_PUT' ])){
|
|
| 69 | - return $GLOBALS[ '_PUT' ]; |
|
| 68 | + if (is_array($GLOBALS['_PUT'])) {
|
|
| 69 | + return $GLOBALS['_PUT']; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | return []; |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | // Fetch content and determine boundary |
| 97 | 97 | $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n")); |
| 98 | 98 | |
| 99 | - if(empty($boundary)){
|
|
| 100 | - parse_str($raw_data,$data); |
|
| 101 | - $GLOBALS[ '_PUT' ] = $data; |
|
| 99 | + if (empty($boundary)) {
|
|
| 100 | + parse_str($raw_data, $data); |
|
| 101 | + $GLOBALS['_PUT'] = $data; |
|
| 102 | 102 | return; |
| 103 | 103 | } |
| 104 | 104 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | foreach ($parts as $part) {
|
| 110 | 110 | // If this is the last part, break |
| 111 | - if ($part == "--\r\n") break; |
|
| 111 | + if ($part=="--\r\n") break; |
|
| 112 | 112 | |
| 113 | 113 | // Separate content from headers |
| 114 | 114 | $part = ltrim($part, "\r\n"); |
@@ -135,10 +135,10 @@ discard block |
||
| 135 | 135 | list(, $type, $name) = $matches; |
| 136 | 136 | |
| 137 | 137 | //Parse File |
| 138 | - if( isset($matches[4]) ) |
|
| 138 | + if (isset($matches[4])) |
|
| 139 | 139 | {
|
| 140 | 140 | //if labeled the same as previous, skip |
| 141 | - if( isset( $_FILES[ $matches[ 2 ] ] ) ) |
|
| 141 | + if (isset($_FILES[$matches[2]])) |
|
| 142 | 142 | {
|
| 143 | 143 | continue; |
| 144 | 144 | } |
@@ -147,16 +147,16 @@ discard block |
||
| 147 | 147 | $filename = $matches[4]; |
| 148 | 148 | |
| 149 | 149 | //get tmp name |
| 150 | - $filename_parts = pathinfo( $filename ); |
|
| 151 | - $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']);
|
|
| 150 | + $filename_parts = pathinfo($filename); |
|
| 151 | + $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']);
|
|
| 152 | 152 | |
| 153 | 153 | //populate $_FILES with information, size may be off in multibyte situation |
| 154 | 154 | /** @noinspection PhpUndefinedVariableInspection */ |
| 155 | - $_FILES[ $matches[ 2 ] ] = array( |
|
| 155 | + $_FILES[$matches[2]] = array( |
|
| 156 | 156 | 'error'=>0, |
| 157 | 157 | 'name'=>$filename, |
| 158 | 158 | 'tmp_name'=>$tmp_name, |
| 159 | - 'size'=>strlen( $body ), |
|
| 159 | + 'size'=>strlen($body), |
|
| 160 | 160 | 'type'=>$value |
| 161 | 161 | ); |
| 162 | 162 | |
@@ -166,12 +166,12 @@ discard block |
||
| 166 | 166 | //Parse Field |
| 167 | 167 | else |
| 168 | 168 | {
|
| 169 | - $data[$name] = substr($body, 0, strlen($body) - 2); |
|
| 169 | + $data[$name] = substr($body, 0, strlen($body)-2); |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | } |
| 174 | - $GLOBALS[ '_PUT' ] = $data; |
|
| 174 | + $GLOBALS['_PUT'] = $data; |
|
| 175 | 175 | return; |
| 176 | 176 | } |
| 177 | 177 | |
@@ -76,8 +76,7 @@ discard block |
||
| 76 | 76 | //catch exception |
| 77 | 77 | exception($this->exceptionParams[$key]['name'],$keyParams) |
| 78 | 78 | ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');
|
| 79 | - } |
|
| 80 | - else{
|
|
| 79 | + } else{
|
|
| 81 | 80 | //catch exception |
| 82 | 81 | exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')');
|
| 83 | 82 | } |
@@ -140,16 +139,14 @@ discard block |
||
| 140 | 139 | } |
| 141 | 140 | } |
| 142 | 141 | |
| 143 | - } |
|
| 144 | - else{
|
|
| 142 | + } else{
|
|
| 145 | 143 | if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){
|
| 146 | 144 | $this->catchException($key,$regex[1]); |
| 147 | 145 | } |
| 148 | 146 | } |
| 149 | 147 | |
| 150 | 148 | } |
| 151 | - } |
|
| 152 | - else{
|
|
| 149 | + } else{
|
|
| 153 | 150 | |
| 154 | 151 | // we control the regex rule that evaluates when only string arrives. |
| 155 | 152 | if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){
|
@@ -198,8 +195,7 @@ discard block |
||
| 198 | 195 | } |
| 199 | 196 | } |
| 200 | 197 | } |
| 201 | - } |
|
| 202 | - else{
|
|
| 198 | + } else{
|
|
| 203 | 199 | |
| 204 | 200 | foreach ($this->inputs[$key] as $ikey=>$input){
|
| 205 | 201 | |
@@ -212,8 +208,7 @@ discard block |
||
| 212 | 208 | } |
| 213 | 209 | } |
| 214 | 210 | } |
| 215 | - } |
|
| 216 | - else{
|
|
| 211 | + } else{
|
|
| 217 | 212 | |
| 218 | 213 | foreach ($input as $ikey=>$item){
|
| 219 | 214 | foreach($rules as $rule){
|
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * @param ApplicationContracts $app |
| 26 | 26 | * @param $request |
| 27 | 27 | */ |
| 28 | - public function __construct(ApplicationContracts $app,$request) |
|
| 28 | + public function __construct(ApplicationContracts $app, $request) |
|
| 29 | 29 | {
|
| 30 | 30 | parent::__construct($app); |
| 31 | 31 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param $key |
| 42 | 42 | * @return mixed|void |
| 43 | 43 | */ |
| 44 | - public function annotation($method,$key) |
|
| 44 | + public function annotation($method, $key) |
|
| 45 | 45 | {
|
| 46 | 46 | //set annotation value with getting reflection |
| 47 | 47 | $reflection = $this->getReflection('reflection')->reflectionMethodParams($method);
|
@@ -66,18 +66,18 @@ discard block |
||
| 66 | 66 | * @param string $key |
| 67 | 67 | * @param null|string $data |
| 68 | 68 | */ |
| 69 | - private function catchException($key,$data) |
|
| 69 | + private function catchException($key, $data) |
|
| 70 | 70 | {
|
| 71 | - if(isset($this->exceptionParams[$key])){
|
|
| 71 | + if (isset($this->exceptionParams[$key])) {
|
|
| 72 | 72 | |
| 73 | 73 | //get key params for exception params |
| 74 | 74 | $keyParams = ($this->exceptionParams[$key]['params']) ?? []; |
| 75 | 75 | |
| 76 | 76 | //catch exception |
| 77 | - exception($this->exceptionParams[$key]['name'],$keyParams) |
|
| 77 | + exception($this->exceptionParams[$key]['name'], $keyParams) |
|
| 78 | 78 | ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');
|
| 79 | 79 | } |
| 80 | - else{
|
|
| 80 | + else {
|
|
| 81 | 81 | //catch exception |
| 82 | 82 | exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')');
|
| 83 | 83 | } |
@@ -90,23 +90,23 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | private function getException($key) |
| 92 | 92 | {
|
| 93 | - if(preg_match('@exception\((.*?)\)|exception\((.*?)\)\r\n@is',$this->annotation,$exception)){
|
|
| 93 | + if (preg_match('@exception\((.*?)\)|exception\((.*?)\)\r\n@is', $this->annotation, $exception)) {
|
|
| 94 | 94 | |
| 95 | - $exceptionSpaceExplode = explode(" ",$exception[1]);
|
|
| 95 | + $exceptionSpaceExplode = explode(" ", $exception[1]);
|
|
| 96 | 96 | |
| 97 | - foreach ($exceptionSpaceExplode as $exceptions){
|
|
| 98 | - $exceptionsDotExplode = explode(":",$exceptions);
|
|
| 97 | + foreach ($exceptionSpaceExplode as $exceptions) {
|
|
| 98 | + $exceptionsDotExplode = explode(":", $exceptions);
|
|
| 99 | 99 | $this->exceptionParams[$key][$exceptionsDotExplode[0]] = $exceptionsDotExplode[1]; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - if(isset($this->exceptionParams[$key]['params'])){
|
|
| 102 | + if (isset($this->exceptionParams[$key]['params'])) {
|
|
| 103 | 103 | |
| 104 | - $paramsCommaExplode = explode(",",$this->exceptionParams[$key]['params']);
|
|
| 104 | + $paramsCommaExplode = explode(",", $this->exceptionParams[$key]['params']);
|
|
| 105 | 105 | unset($this->exceptionParams[$key]['params']); |
| 106 | 106 | |
| 107 | - foreach ($paramsCommaExplode as $params){
|
|
| 108 | - $paramsEqualExplode = explode("=",$params);
|
|
| 109 | - if(isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])){
|
|
| 107 | + foreach ($paramsCommaExplode as $params) {
|
|
| 108 | + $paramsEqualExplode = explode("=", $params);
|
|
| 109 | + if (isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])) {
|
|
| 110 | 110 | $this->exceptionParams[$key]['params'][$paramsEqualExplode[0]] = $paramsEqualExplode[1]; |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -123,37 +123,37 @@ discard block |
||
| 123 | 123 | {
|
| 124 | 124 | // with the method based regex annotation, |
| 125 | 125 | // we check the rule definition for our requests. |
| 126 | - if(preg_match('@regex\((.*?)\)|regex\((.*?)\)\r\n@is',$this->annotation,$regex)){
|
|
| 127 | - if(isset($this->inputs[$key])){
|
|
| 126 | + if (preg_match('@regex\((.*?)\)|regex\((.*?)\)\r\n@is', $this->annotation, $regex)) {
|
|
| 127 | + if (isset($this->inputs[$key])) {
|
|
| 128 | 128 | |
| 129 | 129 | // for the definition of rules, |
| 130 | 130 | // our inputs can be array and in this case we offer array option for user comfort. |
| 131 | - if(is_array($this->inputs[$key])){
|
|
| 131 | + if (is_array($this->inputs[$key])) {
|
|
| 132 | 132 | |
| 133 | - foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue){
|
|
| 133 | + foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue) {
|
|
| 134 | 134 | |
| 135 | - if(is_array($this->inputsValue)){
|
|
| 135 | + if (is_array($this->inputsValue)) {
|
|
| 136 | 136 | |
| 137 | - foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem){
|
|
| 138 | - if(!preg_match('@'.$regex[1].'@is',$inputsValueItem)){
|
|
| 139 | - $this->catchException($key,$regex[1]); |
|
| 137 | + foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem) {
|
|
| 138 | + if (!preg_match('@'.$regex[1].'@is', $inputsValueItem)) {
|
|
| 139 | + $this->catchException($key, $regex[1]); |
|
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | } |
| 144 | - else{
|
|
| 145 | - if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){
|
|
| 146 | - $this->catchException($key,$regex[1]); |
|
| 144 | + else {
|
|
| 145 | + if (!preg_match('@'.$regex[1].'@is', $this->inputsValue)) {
|
|
| 146 | + $this->catchException($key, $regex[1]); |
|
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | - else{
|
|
| 152 | + else {
|
|
| 153 | 153 | |
| 154 | 154 | // we control the regex rule that evaluates when only string arrives. |
| 155 | - if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){
|
|
| 156 | - $this->catchException($key,$regex[1]); |
|
| 155 | + if (!preg_match('@'.$regex[1].'@is', $this->inputs[$key])) {
|
|
| 156 | + $this->catchException($key, $regex[1]); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | } |
@@ -168,9 +168,9 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | private function getRemove($key) |
| 170 | 170 | {
|
| 171 | - if(preg_match('@remove\((.*?)\)\r\n@is',$this->annotation,$remove)){
|
|
| 172 | - if(isset($this->inputs[$key])){
|
|
| 173 | - if(preg_match('@'.$remove[1].'@is',$this->inputs[$key])){
|
|
| 171 | + if (preg_match('@remove\((.*?)\)\r\n@is', $this->annotation, $remove)) {
|
|
| 172 | + if (isset($this->inputs[$key])) {
|
|
| 173 | + if (preg_match('@'.$remove[1].'@is', $this->inputs[$key])) {
|
|
| 174 | 174 | unset($this->inputs[$key]); |
| 175 | 175 | } |
| 176 | 176 | } |
@@ -184,42 +184,42 @@ discard block |
||
| 184 | 184 | */ |
| 185 | 185 | private function getRules($key) |
| 186 | 186 | {
|
| 187 | - if(preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is',$this->annotation,$rule)){
|
|
| 187 | + if (preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is', $this->annotation, $rule)) {
|
|
| 188 | 188 | |
| 189 | 189 | $requestRules = $this->getReflection('rules');
|
| 190 | 190 | |
| 191 | - $rules = explode(":",$rule[1]);
|
|
| 192 | - if(isset($this->inputs[$key]) && !is_array($this->inputs[$key])){
|
|
| 193 | - foreach($rules as $rule){
|
|
| 194 | - if(isset($requestRules[$rule])){
|
|
| 195 | - if(!preg_match('@'.$requestRules[$rule].'@',$this->inputs[$key])){
|
|
| 196 | - exception($rule,['key'=>$key.':'.$this->inputs[$key]]) |
|
| 191 | + $rules = explode(":", $rule[1]);
|
|
| 192 | + if (isset($this->inputs[$key]) && !is_array($this->inputs[$key])) {
|
|
| 193 | + foreach ($rules as $rule) {
|
|
| 194 | + if (isset($requestRules[$rule])) {
|
|
| 195 | + if (!preg_match('@'.$requestRules[$rule].'@', $this->inputs[$key])) {
|
|
| 196 | + exception($rule, ['key'=>$key.':'.$this->inputs[$key]]) |
|
| 197 | 197 | ->invalidArgument($key.':'.$this->inputs[$key].' input value is not valid for '.$rule.' request rule'); |
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | - else{
|
|
| 202 | + else {
|
|
| 203 | 203 | |
| 204 | - foreach ($this->inputs[$key] as $ikey=>$input){
|
|
| 204 | + foreach ($this->inputs[$key] as $ikey=>$input) {
|
|
| 205 | 205 | |
| 206 | - if(!is_array($input)){
|
|
| 207 | - foreach($rules as $rule){
|
|
| 208 | - if(isset($requestRules[$rule])){
|
|
| 209 | - if(!preg_match('@'.$requestRules[$rule].'@',$input)){
|
|
| 210 | - exception($rule,['key'=>''.$key.':'.$input]) |
|
| 206 | + if (!is_array($input)) {
|
|
| 207 | + foreach ($rules as $rule) {
|
|
| 208 | + if (isset($requestRules[$rule])) {
|
|
| 209 | + if (!preg_match('@'.$requestRules[$rule].'@', $input)) {
|
|
| 210 | + exception($rule, ['key'=>''.$key.':'.$input]) |
|
| 211 | 211 | ->invalidArgument($key.':'.$input.' input value is not valid for '.$rule.' request rule'); |
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | } |
| 216 | - else{
|
|
| 216 | + else {
|
|
| 217 | 217 | |
| 218 | - foreach ($input as $ikey=>$item){
|
|
| 219 | - foreach($rules as $rule){
|
|
| 220 | - if(isset($requestRules[$rule])){
|
|
| 221 | - if(!preg_match('@'.$requestRules[$rule].'@',$item)){
|
|
| 222 | - exception($rule,['key'=>''.$key.':'.$item]) |
|
| 218 | + foreach ($input as $ikey=>$item) {
|
|
| 219 | + foreach ($rules as $rule) {
|
|
| 220 | + if (isset($requestRules[$rule])) {
|
|
| 221 | + if (!preg_match('@'.$requestRules[$rule].'@', $item)) {
|
|
| 222 | + exception($rule, ['key'=>''.$key.':'.$item]) |
|
| 223 | 223 | ->invalidArgument($key.':'.$item.' input value is not valid for '.$rule.' request rule'); |
| 224 | 224 | } |
| 225 | 225 | } |
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | // Fetch content and determine boundary |
| 29 | 29 | $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n")); |
| 30 | 30 | |
| 31 | - if(empty($boundary)){ |
|
| 32 | - parse_str($raw_data,$data); |
|
| 33 | - $GLOBALS[ '_PUT' ] = $data; |
|
| 31 | + if (empty($boundary)) { |
|
| 32 | + parse_str($raw_data, $data); |
|
| 33 | + $GLOBALS['_PUT'] = $data; |
|
| 34 | 34 | return; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | foreach ($parts as $part) { |
| 42 | 42 | // If this is the last part, break |
| 43 | - if ($part == "--\r\n") break; |
|
| 43 | + if ($part=="--\r\n") break; |
|
| 44 | 44 | |
| 45 | 45 | // Separate content from headers |
| 46 | 46 | $part = ltrim($part, "\r\n"); |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | list(, $type, $name) = $matches; |
| 68 | 68 | |
| 69 | 69 | //Parse File |
| 70 | - if( isset($matches[4]) ) |
|
| 70 | + if (isset($matches[4])) |
|
| 71 | 71 | { |
| 72 | 72 | //if labeled the same as previous, skip |
| 73 | - if( isset( $_FILES[ $matches[ 2 ] ] ) ) |
|
| 73 | + if (isset($_FILES[$matches[2]])) |
|
| 74 | 74 | { |
| 75 | 75 | continue; |
| 76 | 76 | } |
@@ -79,16 +79,16 @@ discard block |
||
| 79 | 79 | $filename = $matches[4]; |
| 80 | 80 | |
| 81 | 81 | //get tmp name |
| 82 | - $filename_parts = pathinfo( $filename ); |
|
| 83 | - $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
| 82 | + $filename_parts = pathinfo($filename); |
|
| 83 | + $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
| 84 | 84 | |
| 85 | 85 | //populate $_FILES with information, size may be off in multibyte situation |
| 86 | 86 | /** @noinspection PhpUndefinedVariableInspection */ |
| 87 | - $_FILES[ $matches[ 2 ] ] = array( |
|
| 87 | + $_FILES[$matches[2]] = array( |
|
| 88 | 88 | 'error'=>0, |
| 89 | 89 | 'name'=>$filename, |
| 90 | 90 | 'tmp_name'=>$tmp_name, |
| 91 | - 'size'=>strlen( $body ), |
|
| 91 | + 'size'=>strlen($body), |
|
| 92 | 92 | 'type'=>$value |
| 93 | 93 | ); |
| 94 | 94 | |
@@ -98,12 +98,12 @@ discard block |
||
| 98 | 98 | //Parse Field |
| 99 | 99 | else |
| 100 | 100 | { |
| 101 | - $data[$name] = substr($body, 0, strlen($body) - 2); |
|
| 101 | + $data[$name] = substr($body, 0, strlen($body)-2); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | } |
| 106 | - $GLOBALS[ '_PUT' ] = $data; |
|
| 106 | + $GLOBALS['_PUT'] = $data; |
|
| 107 | 107 | return $data; |
| 108 | 108 | } |
| 109 | 109 | |
@@ -111,34 +111,34 @@ discard block |
||
| 111 | 111 | * @param string $method |
| 112 | 112 | * @return array |
| 113 | 113 | */ |
| 114 | - public function httpMethodData($method='get') |
|
| 114 | + public function httpMethodData($method = 'get') |
|
| 115 | 115 | { |
| 116 | 116 | $body = []; |
| 117 | 117 | |
| 118 | - if(httpMethod()==$method){ |
|
| 119 | - $rawData = json_decode(request()->getContent(),1); |
|
| 118 | + if (httpMethod()==$method) { |
|
| 119 | + $rawData = json_decode(request()->getContent(), 1); |
|
| 120 | 120 | |
| 121 | 121 | $get = get(); |
| 122 | - if(is_array($get) && count($get)){ |
|
| 122 | + if (is_array($get) && count($get)) { |
|
| 123 | 123 | $body['params'] = get(); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if(is_null($rawData)){ |
|
| 126 | + if (is_null($rawData)) { |
|
| 127 | 127 | |
| 128 | 128 | $containerMethod = app()->get(httpMethod()); |
| 129 | 129 | |
| 130 | - if(is_array($containerMethod) && count($containerMethod)){ |
|
| 130 | + if (is_array($containerMethod) && count($containerMethod)) { |
|
| 131 | 131 | $inputData = $containerMethod; |
| 132 | 132 | } |
| 133 | - else{ |
|
| 133 | + else { |
|
| 134 | 134 | $inputData = $this->getInputData(); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if(!is_null($inputData)){ |
|
| 137 | + if (!is_null($inputData)) { |
|
| 138 | 138 | $body['body']['form-data'] = $inputData; |
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | - else{ |
|
| 141 | + else { |
|
| 142 | 142 | $body['body']['raw-data'] = $rawData; |
| 143 | 143 | } |
| 144 | 144 | } |
@@ -19,8 +19,9 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | /* Read the data 1 KB at a time |
| 21 | 21 | and write to the file */ |
| 22 | - while ($chunk = fread($putdata, 1024)) |
|
| 23 | - $raw_data .= $chunk; |
|
| 22 | + while ($chunk = fread($putdata, 1024)) {
|
|
| 23 | + $raw_data .= $chunk; |
|
| 24 | + } |
|
| 24 | 25 | |
| 25 | 26 | /* Close the streams */ |
| 26 | 27 | fclose($putdata); |
@@ -40,7 +41,9 @@ discard block |
||
| 40 | 41 | |
| 41 | 42 | foreach ($parts as $part) { |
| 42 | 43 | // If this is the last part, break |
| 43 | - if ($part == "--\r\n") break; |
|
| 44 | + if ($part == "--\r\n") {
|
|
| 45 | + break; |
|
| 46 | + } |
|
| 44 | 47 | |
| 45 | 48 | // Separate content from headers |
| 46 | 49 | $part = ltrim($part, "\r\n"); |
@@ -129,16 +132,14 @@ discard block |
||
| 129 | 132 | |
| 130 | 133 | if(is_array($containerMethod) && count($containerMethod)){ |
| 131 | 134 | $inputData = $containerMethod; |
| 132 | - } |
|
| 133 | - else{ |
|
| 135 | + } else{ |
|
| 134 | 136 | $inputData = $this->getInputData(); |
| 135 | 137 | } |
| 136 | 138 | |
| 137 | 139 | if(!is_null($inputData)){ |
| 138 | 140 | $body['body']['form-data'] = $inputData; |
| 139 | 141 | } |
| 140 | - } |
|
| 141 | - else{ |
|
| 142 | + } else{ |
|
| 142 | 143 | $body['body']['raw-data'] = $rawData; |
| 143 | 144 | } |
| 144 | 145 | } |
@@ -39,8 +39,7 @@ discard block |
||
| 39 | 39 | {
|
| 40 | 40 | if($this->app->has('exceptiontrace')) {
|
| 41 | 41 | $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode(); |
| 42 | - } |
|
| 43 | - else {
|
|
| 42 | + } else {
|
|
| 44 | 43 | $this->data['status'] = (int)$this->exception::exceptionTypeCodes($this->data['errType']); |
| 45 | 44 | } |
| 46 | 45 | } |
@@ -82,8 +81,7 @@ discard block |
||
| 82 | 81 | |
| 83 | 82 | //set as the success object is false |
| 84 | 83 | $this->data['appExceptionSuccess'] = []; |
| 85 | - } |
|
| 86 | - else{
|
|
| 84 | + } else{
|
|
| 87 | 85 | |
| 88 | 86 | //set as the success object is false |
| 89 | 87 | $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']]; |
@@ -186,13 +184,11 @@ discard block |
||
| 186 | 184 | $this->app->register('responseStatus',500);
|
| 187 | 185 | |
| 188 | 186 | |
| 189 | - } |
|
| 190 | - else{
|
|
| 187 | + } else{
|
|
| 191 | 188 | |
| 192 | 189 | if($this->data['status']=='500' && $environment=='production'){
|
| 193 | 190 | $externalMessage = 'An unexpected external error has occurred'; |
| 194 | - } |
|
| 195 | - else{
|
|
| 191 | + } else{
|
|
| 196 | 192 | $externalMessage = $this->data['errStrReal']; |
| 197 | 193 | } |
| 198 | 194 | |
@@ -237,16 +233,14 @@ discard block |
||
| 237 | 233 | |
| 238 | 234 | $responseType = $this->app->get('clientResponseType');
|
| 239 | 235 | echo app()->resolve($this->app->get('out')->formatter())->{$responseType}($lastResult);
|
| 240 | - } |
|
| 241 | - else{
|
|
| 236 | + } else{
|
|
| 242 | 237 | |
| 243 | 238 | $defaultResponseType = (is_null(config('app.response'))) ? 'json' : config('app.response');
|
| 244 | 239 | echo app()->resolve($this->app->get('out')->formatter())->{$defaultResponseType}($lastResult);
|
| 245 | 240 | } |
| 246 | 241 | |
| 247 | 242 | |
| 248 | - } |
|
| 249 | - else{
|
|
| 243 | + } else{
|
|
| 250 | 244 | echo $restaOutHandle; |
| 251 | 245 | } |
| 252 | 246 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | private function getStatusAccordingToExceptionTrace() |
| 39 | 39 | {
|
| 40 | - if($this->app->has('exceptiontrace')) {
|
|
| 40 | + if ($this->app->has('exceptiontrace')) {
|
|
| 41 | 41 | $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode(); |
| 42 | 42 | } |
| 43 | 43 | else {
|
@@ -54,21 +54,21 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | $this->app->terminate('responseSuccess');
|
| 56 | 56 | $this->app->terminate('responseStatus');
|
| 57 | - $this->app->register('responseSuccess',(bool)false);
|
|
| 58 | - $this->app->register('responseStatus',$this->data['status']);
|
|
| 57 | + $this->app->register('responseSuccess', (bool)false);
|
|
| 58 | + $this->app->register('responseStatus', $this->data['status']);
|
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | - $optionalException = str_replace("\\","\\\\",$this->app->namespace()->exception());
|
|
| 61 | + $optionalException = str_replace("\\", "\\\\", $this->app->namespace()->exception());
|
|
| 62 | 62 | |
| 63 | - if(preg_match('@'.$optionalException.'@is',$this->data['errType'])){
|
|
| 63 | + if (preg_match('@'.$optionalException.'@is', $this->data['errType'])) {
|
|
| 64 | 64 | |
| 65 | 65 | //trace pattern |
| 66 | 66 | $trace = $this->data['errContext']['trace']; |
| 67 | - if(preg_match('@Stack trace:\n#0(.*)\n#1@is',$trace,$traceArray)){
|
|
| 67 | + if (preg_match('@Stack trace:\n#0(.*)\n#1@is', $trace, $traceArray)) {
|
|
| 68 | 68 | |
| 69 | - $traceFile = str_replace(root,'',$traceArray[1]); |
|
| 69 | + $traceFile = str_replace(root, '', $traceArray[1]); |
|
| 70 | 70 | |
| 71 | - if(preg_match('@(.*)\((\d+)\)@is',$traceFile,$traceResolve)){
|
|
| 71 | + if (preg_match('@(.*)\((\d+)\)@is', $traceFile, $traceResolve)) {
|
|
| 72 | 72 | $this->data['errFile'] = $traceResolve[1]; |
| 73 | 73 | $this->data['errLine'] = (int)$traceResolve[2]; |
| 74 | 74 | } |
@@ -78,15 +78,15 @@ discard block |
||
| 78 | 78 | $this->data['errType'] = class_basename($this->data['errType']); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - if(is_array($meta = config('response.meta'))){
|
|
| 81 | + if (is_array($meta = config('response.meta'))) {
|
|
| 82 | 82 | |
| 83 | 83 | //set as the success object is false |
| 84 | 84 | $this->data['appExceptionSuccess'] = []; |
| 85 | 85 | } |
| 86 | - else{
|
|
| 86 | + else {
|
|
| 87 | 87 | |
| 88 | 88 | //set as the success object is false |
| 89 | - $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']]; |
|
| 89 | + $this->data['appExceptionSuccess'] = ['success'=>(bool)false, 'status'=>$this->data['status']]; |
|
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | //This function can be used for defining your own way of handling errors during runtime, |
| 109 | 109 | //for example in applications in which you need to do cleanup of data/files when a critical error happens, |
| 110 | 110 | //or when you need to trigger an error under certain conditions (using trigger_error()). |
| 111 | - set_error_handler([$this,'setErrorHandler']); |
|
| 111 | + set_error_handler([$this, 'setErrorHandler']); |
|
| 112 | 112 | |
| 113 | 113 | //Registers a callback to be executed after script execution finishes or exit() is called. |
| 114 | 114 | //Multiple calls to register_shutdown_function() can be made, and each will be called in the same order as |
| 115 | 115 | //they were registered. If you call exit() within one registered shutdown function, |
| 116 | 116 | //processing will stop completely and no other registered shutdown functions will be called. |
| 117 | - register_shutdown_function([$this,'fatalErrorShutdownHandler']); |
|
| 117 | + register_shutdown_function([$this, 'fatalErrorShutdownHandler']); |
|
| 118 | 118 | |
| 119 | 119 | } |
| 120 | 120 | |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * @param null|string $errLine |
| 128 | 128 | * @param null|string $errContext |
| 129 | 129 | */ |
| 130 | - public function setErrorHandler($errNo=null, $errStr=null, $errFile=null, $errLine=null, $errContext=null) |
|
| 130 | + public function setErrorHandler($errNo = null, $errStr = null, $errFile = null, $errLine = null, $errContext = null) |
|
| 131 | 131 | {
|
| 132 | 132 | // in case of a deficiency, |
| 133 | 133 | // we need to boot our general needs to be needed for the exception. |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | //get lang message for exception |
| 155 | 155 | $this->getLangMessageForException(); |
| 156 | 156 | |
| 157 | - if($this->app->has('exceptiontrace')){
|
|
| 157 | + if ($this->app->has('exceptiontrace')) {
|
|
| 158 | 158 | |
| 159 | 159 | $customExceptionTrace = $this->app['exceptiontrace']; |
| 160 | 160 | $this->data['errFile'] = $customExceptionTrace['file']; |
@@ -163,40 +163,39 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | $environment = $this->app->environment(); |
| 165 | 165 | |
| 166 | - $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'','',$this->data['errFile']); |
|
| 166 | + $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'', '', $this->data['errFile']); |
|
| 167 | 167 | |
| 168 | - if(preg_match('@vendor.*\.php@is',$vendorDirectory,$vd)){
|
|
| 168 | + if (preg_match('@vendor.*\.php@is', $vendorDirectory, $vd)) {
|
|
| 169 | 169 | $vendorDirectory = $vd[0]; |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - if(Str::startsWith($vendorDirectory,'vendor') |
|
| 173 | - && Str::startsWith($vendorDirectory,'vendor/php-resta')===false) |
|
| 172 | + if (Str::startsWith($vendorDirectory, 'vendor') |
|
| 173 | + && Str::startsWith($vendorDirectory, 'vendor/php-resta')===false) |
|
| 174 | 174 | {
|
| 175 | 175 | |
| 176 | 176 | $externalMessage = ($environment==="production") ? |
| 177 | - 'An unexpected external error has occurred' : |
|
| 178 | - $this->data['errStrReal']; |
|
| 177 | + 'An unexpected external error has occurred' : $this->data['errStrReal']; |
|
| 179 | 178 | |
| 180 | - $this->result = $this->getAppException($environment,$externalMessage); |
|
| 179 | + $this->result = $this->getAppException($environment, $externalMessage); |
|
| 181 | 180 | |
| 182 | 181 | |
| 183 | 182 | //Get or Set the HTTP response code |
| 184 | 183 | http_response_code(500); |
| 185 | 184 | $this->app->terminate('responseStatus');
|
| 186 | - $this->app->register('responseStatus',500);
|
|
| 185 | + $this->app->register('responseStatus', 500);
|
|
| 187 | 186 | |
| 188 | 187 | |
| 189 | 188 | } |
| 190 | - else{
|
|
| 189 | + else {
|
|
| 191 | 190 | |
| 192 | - if($this->data['status']=='500' && $environment=='production'){
|
|
| 191 | + if ($this->data['status']=='500' && $environment=='production') {
|
|
| 193 | 192 | $externalMessage = 'An unexpected external error has occurred'; |
| 194 | 193 | } |
| 195 | - else{
|
|
| 194 | + else {
|
|
| 196 | 195 | $externalMessage = $this->data['errStrReal']; |
| 197 | 196 | } |
| 198 | 197 | |
| 199 | - $this->result = $this->getAppException($environment,$externalMessage); |
|
| 198 | + $this->result = $this->getAppException($environment, $externalMessage); |
|
| 200 | 199 | |
| 201 | 200 | //Get or Set the HTTP response code |
| 202 | 201 | http_response_code($this->data['status']); |
@@ -206,39 +205,39 @@ discard block |
||
| 206 | 205 | // that is presented as an extra to the exception result set. |
| 207 | 206 | $this->result = $this->getExceptionExtender(); |
| 208 | 207 | |
| 209 | - if($environment==="production"){
|
|
| 210 | - $productionLogMessage = $this->getAppException('local',$this->data['errStrReal']);
|
|
| 211 | - $productionLogMessage = array_merge($this->result,$productionLogMessage); |
|
| 212 | - $this->app->register('productionLogMessage',$this->app->get('out')->outputFormatter($productionLogMessage));
|
|
| 208 | + if ($environment==="production") {
|
|
| 209 | + $productionLogMessage = $this->getAppException('local', $this->data['errStrReal']);
|
|
| 210 | + $productionLogMessage = array_merge($this->result, $productionLogMessage); |
|
| 211 | + $this->app->register('productionLogMessage', $this->app->get('out')->outputFormatter($productionLogMessage));
|
|
| 213 | 212 | } |
| 214 | 213 | |
| 215 | 214 | //set json app exception |
| 216 | - $this->app->register('routerResult',$this->result);
|
|
| 215 | + $this->app->register('routerResult', $this->result);
|
|
| 217 | 216 | |
| 218 | - if($this->app->has('exceptionResponse')){
|
|
| 217 | + if ($this->app->has('exceptionResponse')) {
|
|
| 219 | 218 | $exceptionResponse = $this->app->get('exceptionResponse');
|
| 220 | - $exceptionResponse((isset($productionLogMessage)) ? $productionLogMessage : $this->result,$this->data['status']); |
|
| 219 | + $exceptionResponse((isset($productionLogMessage)) ? $productionLogMessage : $this->result, $this->data['status']); |
|
| 221 | 220 | } |
| 222 | 221 | |
| 223 | 222 | $restaOutHandle = null; |
| 224 | 223 | |
| 225 | - if(!defined('responseApp')){
|
|
| 224 | + if (!defined('responseApp')) {
|
|
| 226 | 225 | $restaOutHandle = $this->app->get('out')->handle();
|
| 227 | 226 | } |
| 228 | 227 | |
| 229 | 228 | header("HTTP/1.1 ".$this->data['status']);
|
| 230 | 229 | |
| 231 | - if($restaOutHandle===null){
|
|
| 230 | + if ($restaOutHandle===null) {
|
|
| 232 | 231 | |
| 233 | 232 | //header set and symfony response call |
| 234 | 233 | $lastResult = $this->app->get('out')->outputFormatter($this->result);
|
| 235 | 234 | |
| 236 | - if($this->app->has('clientResponseType')){
|
|
| 235 | + if ($this->app->has('clientResponseType')) {
|
|
| 237 | 236 | |
| 238 | 237 | $responseType = $this->app->get('clientResponseType');
|
| 239 | 238 | echo app()->resolve($this->app->get('out')->formatter())->{$responseType}($lastResult);
|
| 240 | 239 | } |
| 241 | - else{
|
|
| 240 | + else {
|
|
| 242 | 241 | |
| 243 | 242 | $defaultResponseType = (is_null(config('app.response'))) ? 'json' : config('app.response');
|
| 244 | 243 | echo app()->resolve($this->app->get('out')->formatter())->{$defaultResponseType}($lastResult);
|
@@ -246,7 +245,7 @@ discard block |
||
| 246 | 245 | |
| 247 | 246 | |
| 248 | 247 | } |
| 249 | - else{
|
|
| 248 | + else {
|
|
| 250 | 249 | echo $restaOutHandle; |
| 251 | 250 | } |
| 252 | 251 | |
@@ -257,7 +256,7 @@ discard block |
||
| 257 | 256 | * @param $environment |
| 258 | 257 | * @return mixed |
| 259 | 258 | */ |
| 260 | - private function getAppException($environment,$message) |
|
| 259 | + private function getAppException($environment, $message) |
|
| 261 | 260 | {
|
| 262 | 261 | return $this->data['appExceptionSuccess']+$this->data['exception']::$environment( |
| 263 | 262 | $this->data['errNo'], |
@@ -277,7 +276,7 @@ discard block |
||
| 277 | 276 | private function getExceptionExtender() |
| 278 | 277 | {
|
| 279 | 278 | return $this->app->resolve( |
| 280 | - $this->app->get('macro')->call('exceptionExtender',function(){
|
|
| 279 | + $this->app->get('macro')->call('exceptionExtender', function() {
|
|
| 281 | 280 | return ExceptionExtender::class; |
| 282 | 281 | }), |
| 283 | 282 | ['result'=>$this->result])->getResult(); |
@@ -295,13 +294,13 @@ discard block |
||
| 295 | 294 | |
| 296 | 295 | $this->inStackTrace($last_error); |
| 297 | 296 | |
| 298 | - if(!is_null($last_error)){
|
|
| 297 | + if (!is_null($last_error)) {
|
|
| 299 | 298 | |
| 300 | - if(!defined('methodName')){
|
|
| 301 | - define('methodName',null);
|
|
| 299 | + if (!defined('methodName')) {
|
|
| 300 | + define('methodName', null);
|
|
| 302 | 301 | } |
| 303 | 302 | |
| 304 | - if($this->app->has('exceptionFile')){
|
|
| 303 | + if ($this->app->has('exceptionFile')) {
|
|
| 305 | 304 | $last_error['file'] = $this->app['exceptionFile']; |
| 306 | 305 | $last_error['line'] = $this->app['exceptionLine']; |
| 307 | 306 | } |
@@ -321,13 +320,13 @@ discard block |
||
| 321 | 320 | */ |
| 322 | 321 | public function inStackTrace($error) |
| 323 | 322 | {
|
| 324 | - if($this->app->has('urlComponent') && isset($error['file'])){
|
|
| 325 | - if(!preg_match('@'.$this->app['urlComponent']['project'].'@',$error['file'])
|
|
| 326 | - && !$this->app->has('exceptionFile')){
|
|
| 327 | - if(preg_match('@ in\s(.*?)\n@is',$error['message'],$result)){
|
|
| 328 | - $errorMessage = explode(":",$result[1]);
|
|
| 329 | - $this->app->register('exceptionFile',$errorMessage[0]);
|
|
| 330 | - $this->app->register('exceptionLine',$errorMessage[1]);
|
|
| 323 | + if ($this->app->has('urlComponent') && isset($error['file'])) {
|
|
| 324 | + if (!preg_match('@'.$this->app['urlComponent']['project'].'@', $error['file'])
|
|
| 325 | + && !$this->app->has('exceptionFile')) {
|
|
| 326 | + if (preg_match('@ in\s(.*?)\n@is', $error['message'], $result)) {
|
|
| 327 | + $errorMessage = explode(":", $result[1]);
|
|
| 328 | + $this->app->register('exceptionFile', $errorMessage[0]);
|
|
| 329 | + $this->app->register('exceptionLine', $errorMessage[1]);
|
|
| 331 | 330 | } |
| 332 | 331 | } |
| 333 | 332 | } |
@@ -340,33 +339,33 @@ discard block |
||
| 340 | 339 | {
|
| 341 | 340 | $clone = clone $this; |
| 342 | 341 | |
| 343 | - if($this->app->has('exceptionTranslate')){
|
|
| 342 | + if ($this->app->has('exceptionTranslate')) {
|
|
| 344 | 343 | |
| 345 | 344 | $langMessage = trans('exception.'.$this->app->get('exceptionTranslate'));
|
| 346 | 345 | |
| 347 | - if(!is_null($langMessage) && $this->app->has('exceptionTranslateParams')){
|
|
| 346 | + if (!is_null($langMessage) && $this->app->has('exceptionTranslateParams')) {
|
|
| 348 | 347 | |
| 349 | - if(count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])){
|
|
| 350 | - foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value){
|
|
| 348 | + if (count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])) {
|
|
| 349 | + foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value) {
|
|
| 351 | 350 | |
| 352 | 351 | $valueLangName = !is_null(trans('default.'.$value)) ? trans('default.'.$value) : $value;
|
| 353 | - $langMessage = preg_replace('@\('.$key.'\)@is',$valueLangName,$langMessage);
|
|
| 352 | + $langMessage = preg_replace('@\('.$key.'\)@is', $valueLangName, $langMessage);
|
|
| 354 | 353 | } |
| 355 | 354 | } |
| 356 | 355 | } |
| 357 | 356 | |
| 358 | - if($langMessage!==null){
|
|
| 357 | + if ($langMessage!==null) {
|
|
| 359 | 358 | $this->data['errStrReal'] = $langMessage; |
| 360 | 359 | } |
| 361 | 360 | } |
| 362 | 361 | |
| 363 | - if(class_exists($this->data['errorClassNamespace']) |
|
| 362 | + if (class_exists($this->data['errorClassNamespace']) |
|
| 364 | 363 | && |
| 365 | - (Str::startsWith($this->data['errorClassNamespace'],'App') |
|
| 366 | - || Str::startsWith($this->data['errorClassNamespace'],__NAMESPACE__))){
|
|
| 364 | + (Str::startsWith($this->data['errorClassNamespace'], 'App') |
|
| 365 | + || Str::startsWith($this->data['errorClassNamespace'], __NAMESPACE__))) {
|
|
| 367 | 366 | |
| 368 | 367 | ClosureDispatcher::bind($this->data['errorClassNamespace'])->call(function() use ($clone) {
|
| 369 | - if(property_exists($this,'lang')){
|
|
| 368 | + if (property_exists($this, 'lang')) {
|
|
| 370 | 369 | $clone->setLang($this->lang); |
| 371 | 370 | } |
| 372 | 371 | }); |
@@ -376,7 +375,7 @@ discard block |
||
| 376 | 375 | |
| 377 | 376 | $langMessage = (!is_null($this->data['lang'])) ? trans('exception.'.$this->data['lang']) : null;
|
| 378 | 377 | |
| 379 | - if($langMessage!==null){
|
|
| 378 | + if ($langMessage!==null) {
|
|
| 380 | 379 | $this->data['errStrReal'] = $langMessage; |
| 381 | 380 | } |
| 382 | 381 | } |
@@ -390,14 +389,14 @@ discard block |
||
| 390 | 389 | {
|
| 391 | 390 | // catch exception via preg match |
| 392 | 391 | // and then clear the Uncaught statement from inside. |
| 393 | - if(preg_match('@(.*?):@is',$this->data['errStrReal'],$errArr)){
|
|
| 392 | + if (preg_match('@(.*?):@is', $this->data['errStrReal'], $errArr)) {
|
|
| 394 | 393 | |
| 395 | - $this->data['errType'] = trim(str_replace('Uncaught','',$errArr[1]));
|
|
| 394 | + $this->data['errType'] = trim(str_replace('Uncaught', '', $errArr[1]));
|
|
| 396 | 395 | $this->data['errorClassNamespace'] = $this->data['errType']; |
| 397 | 396 | } |
| 398 | 397 | |
| 399 | - if(preg_match('@Uncaught@is',$this->data['errStrReal'])
|
|
| 400 | - && preg_match('@(.*?):(.*?)\sin\s@is',$this->data['errStrReal'],$errStrRealArray)){
|
|
| 398 | + if (preg_match('@Uncaught@is', $this->data['errStrReal'])
|
|
| 399 | + && preg_match('@(.*?):(.*?)\sin\s@is', $this->data['errStrReal'], $errStrRealArray)) {
|
|
| 401 | 400 | $this->data['errStrReal'] = trim($errStrRealArray[2]); |
| 402 | 401 | } |
| 403 | 402 | |
@@ -417,7 +416,7 @@ discard block |
||
| 417 | 416 | /** |
| 418 | 417 | * @param null|string $lang |
| 419 | 418 | */ |
| 420 | - public function setLang($lang=null) |
|
| 419 | + public function setLang($lang = null) |
|
| 421 | 420 | {
|
| 422 | 421 | $this->lang = $lang; |
| 423 | 422 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | foreach ($array as $values) {
|
| 46 | 46 | if ($values instanceof Collection) {
|
| 47 | 47 | $values = $values->all(); |
| 48 | - } elseif (! is_array($values)) {
|
|
| 48 | + } elseif (!is_array($values)) {
|
|
| 49 | 49 | continue; |
| 50 | 50 | } |
| 51 | 51 | $results = array_merge($results, $values); |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | {
|
| 95 | 95 | $results = []; |
| 96 | 96 | foreach ($array as $key => $value) {
|
| 97 | - if (is_array($value) && ! empty($value)) {
|
|
| 97 | + if (is_array($value) && !empty($value)) {
|
|
| 98 | 98 | $results = array_merge($results, static::dot($value, $prepend.$key.'.')); |
| 99 | 99 | } else {
|
| 100 | 100 | $results[$prepend.$key] = $value; |
@@ -180,12 +180,12 @@ discard block |
||
| 180 | 180 | $result = []; |
| 181 | 181 | foreach ($array as $item) {
|
| 182 | 182 | $item = $item instanceof Collection ? $item->all() : $item; |
| 183 | - if (! is_array($item)) {
|
|
| 183 | + if (!is_array($item)) {
|
|
| 184 | 184 | $result[] = $item; |
| 185 | - } elseif ($depth === 1) {
|
|
| 185 | + } elseif ($depth===1) {
|
|
| 186 | 186 | $result = array_merge($result, array_values($item)); |
| 187 | 187 | } else {
|
| 188 | - $result = array_merge($result, static::flatten($item, $depth - 1)); |
|
| 188 | + $result = array_merge($result, static::flatten($item, $depth-1)); |
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | return $result; |
@@ -200,8 +200,8 @@ discard block |
||
| 200 | 200 | public static function forget(&$array, $keys) |
| 201 | 201 | {
|
| 202 | 202 | $original = &$array; |
| 203 | - $keys = (array) $keys; |
|
| 204 | - if (count($keys) === 0) {
|
|
| 203 | + $keys = (array)$keys; |
|
| 204 | + if (count($keys)===0) {
|
|
| 205 | 205 | return; |
| 206 | 206 | } |
| 207 | 207 | foreach ($keys as $key) {
|
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | $parts = explode('.', $key);
|
| 214 | 214 | // clean up before each pass |
| 215 | 215 | $array = &$original; |
| 216 | - while (count($parts) > 1) {
|
|
| 216 | + while (count($parts)>1) {
|
|
| 217 | 217 | $part = array_shift($parts); |
| 218 | 218 | if (isset($array[$part]) && is_array($array[$part])) {
|
| 219 | 219 | $array = &$array[$part]; |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | */ |
| 235 | 235 | public static function get($array, $key, $default = null) |
| 236 | 236 | {
|
| 237 | - if (! static::accessible($array)) {
|
|
| 237 | + if (!static::accessible($array)) {
|
|
| 238 | 238 | return value($default); |
| 239 | 239 | } |
| 240 | 240 | if (is_null($key)) {
|
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | if (static::exists($array, $key)) {
|
| 244 | 244 | return $array[$key]; |
| 245 | 245 | } |
| 246 | - if (strpos($key, '.') === false) {
|
|
| 246 | + if (strpos($key, '.')===false) {
|
|
| 247 | 247 | return $array[$key] ?? value($default); |
| 248 | 248 | } |
| 249 | 249 | foreach (explode('.', $key) as $segment) {
|
@@ -267,11 +267,11 @@ discard block |
||
| 267 | 267 | if (is_null($keys)) {
|
| 268 | 268 | return false; |
| 269 | 269 | } |
| 270 | - $keys = (array) $keys; |
|
| 271 | - if (! $array) {
|
|
| 270 | + $keys = (array)$keys; |
|
| 271 | + if (!$array) {
|
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | - if ($keys === []) {
|
|
| 274 | + if ($keys===[]) {
|
|
| 275 | 275 | return false; |
| 276 | 276 | } |
| 277 | 277 | foreach ($keys as $key) {
|
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | public static function isAssoc(array $array) |
| 301 | 301 | {
|
| 302 | 302 | $keys = array_keys($array); |
| 303 | - return array_keys($keys) !== $keys; |
|
| 303 | + return array_keys($keys)!==$keys; |
|
| 304 | 304 | } |
| 305 | 305 | /** |
| 306 | 306 | * Get a subset of the items from the given array. |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | */ |
| 312 | 312 | public static function only($array, $keys) |
| 313 | 313 | {
|
| 314 | - return array_intersect_key($array, array_flip((array) $keys)); |
|
| 314 | + return array_intersect_key($array, array_flip((array)$keys)); |
|
| 315 | 315 | } |
| 316 | 316 | /** |
| 317 | 317 | * Pluck an array of values from an array. |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | } else {
|
| 336 | 336 | $itemKey = data_get($item, $key); |
| 337 | 337 | if (is_object($itemKey) && method_exists($itemKey, '__toString')) {
|
| 338 | - $itemKey = (string) $itemKey; |
|
| 338 | + $itemKey = (string)$itemKey; |
|
| 339 | 339 | } |
| 340 | 340 | $results[$itemKey] = $itemValue; |
| 341 | 341 | } |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | if (is_null($key)) {
|
| 369 | 369 | array_unshift($array, $value); |
| 370 | 370 | } else {
|
| 371 | - $array = [$key => $value] + $array; |
|
| 371 | + $array = [$key => $value]+$array; |
|
| 372 | 372 | } |
| 373 | 373 | return $array; |
| 374 | 374 | } |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | {
|
| 400 | 400 | $requested = is_null($number) ? 1 : $number; |
| 401 | 401 | $count = count($array); |
| 402 | - if ($requested > $count) {
|
|
| 402 | + if ($requested>$count) {
|
|
| 403 | 403 | throw new InvalidArgumentException( |
| 404 | 404 | "You requested {$requested} items, but there are only {$count} items available."
|
| 405 | 405 | ); |
@@ -407,12 +407,12 @@ discard block |
||
| 407 | 407 | if (is_null($number)) {
|
| 408 | 408 | return $array[array_rand($array)]; |
| 409 | 409 | } |
| 410 | - if ((int) $number === 0) {
|
|
| 410 | + if ((int)$number===0) {
|
|
| 411 | 411 | return []; |
| 412 | 412 | } |
| 413 | 413 | $keys = array_rand($array, $number); |
| 414 | 414 | $results = []; |
| 415 | - foreach ((array) $keys as $key) {
|
|
| 415 | + foreach ((array)$keys as $key) {
|
|
| 416 | 416 | $results[] = $array[$key]; |
| 417 | 417 | } |
| 418 | 418 | return $results; |
@@ -433,12 +433,12 @@ discard block |
||
| 433 | 433 | return $array = $value; |
| 434 | 434 | } |
| 435 | 435 | $keys = explode('.', $key);
|
| 436 | - while (count($keys) > 1) {
|
|
| 436 | + while (count($keys)>1) {
|
|
| 437 | 437 | $key = array_shift($keys); |
| 438 | 438 | // If the key doesn't exist at this depth, we will just create an empty array |
| 439 | 439 | // to hold the next value, allowing us to create the arrays to hold final |
| 440 | 440 | // values at the correct depth. Then we'll keep digging into the array. |
| 441 | - if (! isset($array[$key]) || ! is_array($array[$key])) {
|
|
| 441 | + if (!isset($array[$key]) || !is_array($array[$key])) {
|
|
| 442 | 442 | $array[$key] = []; |
| 443 | 443 | } |
| 444 | 444 | $array = &$array[$key]; |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | shuffle($array); |
| 460 | 460 | } else {
|
| 461 | 461 | srand($seed); |
| 462 | - usort($array, function () {
|
|
| 462 | + usort($array, function() {
|
|
| 463 | 463 | return rand(-1, 1); |
| 464 | 464 | }); |
| 465 | 465 | } |
@@ -536,16 +536,16 @@ discard block |
||
| 536 | 536 | * @param array $referenceArray |
| 537 | 537 | * @return array |
| 538 | 538 | */ |
| 539 | - public static function removeSameValues($removeArray=array(),$referenceArray=array()) |
|
| 539 | + public static function removeSameValues($removeArray = array(), $referenceArray = array()) |
|
| 540 | 540 | {
|
| 541 | 541 | $list = []; |
| 542 | 542 | |
| 543 | - foreach ($removeArray as $remove){
|
|
| 544 | - if(!in_array($remove,$referenceArray)){
|
|
| 545 | - $list[]=$remove; |
|
| 543 | + foreach ($removeArray as $remove) {
|
|
| 544 | + if (!in_array($remove, $referenceArray)) {
|
|
| 545 | + $list[] = $remove; |
|
| 546 | 546 | } |
| 547 | 547 | } |
| 548 | - return array_merge($referenceArray,$list); |
|
| 548 | + return array_merge($referenceArray, $list); |
|
| 549 | 549 | } |
| 550 | 550 | |
| 551 | 551 | /** |
@@ -553,9 +553,9 @@ discard block |
||
| 553 | 553 | * @param $key |
| 554 | 554 | * @return null |
| 555 | 555 | */ |
| 556 | - public static function isset($array,$key) |
|
| 556 | + public static function isset($array, $key) |
|
| 557 | 557 | {
|
| 558 | - if(isset($array[$key])){
|
|
| 558 | + if (isset($array[$key])) {
|
|
| 559 | 559 | return $array[$key]; |
| 560 | 560 | } |
| 561 | 561 | return null; |
@@ -566,13 +566,13 @@ discard block |
||
| 566 | 566 | * @param null $withKey |
| 567 | 567 | * @return bool |
| 568 | 568 | */ |
| 569 | - public static function isArrayWithCount($array,$withKey=null) |
|
| 569 | + public static function isArrayWithCount($array, $withKey = null) |
|
| 570 | 570 | {
|
| 571 | - if($withKey===null){
|
|
| 571 | + if ($withKey===null) {
|
|
| 572 | 572 | return is_array($array) && count($array); |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | - return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey],null); |
|
| 575 | + return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey], null); |
|
| 576 | 576 | } |
| 577 | 577 | |
| 578 | 578 | /** |
@@ -580,12 +580,12 @@ discard block |
||
| 580 | 580 | * @param $array2 |
| 581 | 581 | * @return int |
| 582 | 582 | */ |
| 583 | - public static function arrayDiffKey($array1,$array2) |
|
| 583 | + public static function arrayDiffKey($array1, $array2) |
|
| 584 | 584 | {
|
| 585 | - $forArray1 = array_diff_key($array1,$array2); |
|
| 586 | - $forArray2 = array_diff_key($array2,$array1); |
|
| 585 | + $forArray1 = array_diff_key($array1, $array2); |
|
| 586 | + $forArray2 = array_diff_key($array2, $array1); |
|
| 587 | 587 | |
| 588 | - if(count($forArray1)=="0" && count($forArray2)=="0"){
|
|
| 588 | + if (count($forArray1)=="0" && count($forArray2)=="0") {
|
|
| 589 | 589 | return true; |
| 590 | 590 | } |
| 591 | 591 | return false; |
@@ -597,12 +597,12 @@ discard block |
||
| 597 | 597 | * @param $original |
| 598 | 598 | * @param array $overwrite |
| 599 | 599 | */ |
| 600 | - public static function overwriteWith($original,$overwrite=array()) |
|
| 600 | + public static function overwriteWith($original, $overwrite = array()) |
|
| 601 | 601 | {
|
| 602 | - foreach ($original as $key=>$item){
|
|
| 602 | + foreach ($original as $key=>$item) {
|
|
| 603 | 603 | |
| 604 | - if(array_key_exists($key,$overwrite)){
|
|
| 605 | - array_splice($original,$key,0,$overwrite[$key]); |
|
| 604 | + if (array_key_exists($key, $overwrite)) {
|
|
| 605 | + array_splice($original, $key, 0, $overwrite[$key]); |
|
| 606 | 606 | } |
| 607 | 607 | } |
| 608 | 608 | |
@@ -616,12 +616,12 @@ discard block |
||
| 616 | 616 | * @param array $remove |
| 617 | 617 | * @return array |
| 618 | 618 | */ |
| 619 | - public static function removeKey($data,$remove=array()) |
|
| 619 | + public static function removeKey($data, $remove = array()) |
|
| 620 | 620 | {
|
| 621 | 621 | $list = []; |
| 622 | 622 | |
| 623 | - foreach($data as $key=>$value){
|
|
| 624 | - if(!in_array($key,$remove)){
|
|
| 623 | + foreach ($data as $key=>$value) {
|
|
| 624 | + if (!in_array($key, $remove)) {
|
|
| 625 | 625 | $list[$key] = $value; |
| 626 | 626 | } |
| 627 | 627 | } |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | * @param $key |
| 635 | 635 | * @param $value |
| 636 | 636 | */ |
| 637 | - public static function setNested($data=array(),$key,$value) |
|
| 637 | + public static function setNested($data = array(), $key, $value) |
|
| 638 | 638 | {
|
| 639 | 639 | dd($data); |
| 640 | 640 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | * |
| 16 | 16 | * @param array $data |
| 17 | 17 | */ |
| 18 | - public function __construct( array $data = [] ) |
|
| 18 | + public function __construct(array $data = []) |
|
| 19 | 19 | { |
| 20 | 20 | $this->data = $data; |
| 21 | 21 | } |
@@ -26,16 +26,16 @@ discard block |
||
| 26 | 26 | * |
| 27 | 27 | * @return array|mixed|null |
| 28 | 28 | */ |
| 29 | - public function safeGet( array $target, $indices ) |
|
| 29 | + public function safeGet(array $target, $indices) |
|
| 30 | 30 | { |
| 31 | 31 | $movingTarget = $target; |
| 32 | 32 | |
| 33 | - foreach ( $indices as $index ) |
|
| 33 | + foreach ($indices as $index) |
|
| 34 | 34 | { |
| 35 | - $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess; |
|
| 36 | - if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL; |
|
| 35 | + $isArray = is_array($movingTarget) || $movingTarget instanceof ArrayAccess; |
|
| 36 | + if (!$isArray || !isset($movingTarget[$index])) return NULL; |
|
| 37 | 37 | |
| 38 | - $movingTarget = $movingTarget[ $index ]; |
|
| 38 | + $movingTarget = $movingTarget[$index]; |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | return $movingTarget; |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @return array|mixed|null |
| 48 | 48 | */ |
| 49 | - public function getKeys( array $keys ) |
|
| 49 | + public function getKeys(array $keys) |
|
| 50 | 50 | { |
| 51 | - return static::safeGet( $this->data, $keys ); |
|
| 51 | + return static::safeGet($this->data, $keys); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | * |
| 61 | 61 | * @return array|mixed|null |
| 62 | 62 | */ |
| 63 | - public function get( $accessString ) |
|
| 63 | + public function get($accessString) |
|
| 64 | 64 | { |
| 65 | - return $this->getKeys( $this->parseDotNotation( $accessString ) ); |
|
| 65 | + return $this->getKeys($this->parseDotNotation($accessString)); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -71,29 +71,29 @@ discard block |
||
| 71 | 71 | * |
| 72 | 72 | * @return $this |
| 73 | 73 | */ |
| 74 | - public function set( $propString, $value ) |
|
| 74 | + public function set($propString, $value) |
|
| 75 | 75 | { |
| 76 | 76 | $movingTarget = &$this->data; |
| 77 | - $keys = $this->parseDotNotation( $propString ); |
|
| 78 | - $length = count( $keys ); |
|
| 77 | + $keys = $this->parseDotNotation($propString); |
|
| 78 | + $length = count($keys); |
|
| 79 | 79 | |
| 80 | - foreach ( $keys as $i => $key ) |
|
| 80 | + foreach ($keys as $i => $key) |
|
| 81 | 81 | { |
| 82 | - $lastKey = $i === $length - 1; |
|
| 83 | - $isset = isset( $movingTarget[ $key ] ); |
|
| 82 | + $lastKey = $i===$length-1; |
|
| 83 | + $isset = isset($movingTarget[$key]); |
|
| 84 | 84 | |
| 85 | - if ( $isset && ! $lastKey && ! is_array( $movingTarget[ $key ] ) ) |
|
| 85 | + if ($isset && !$lastKey && !is_array($movingTarget[$key])) |
|
| 86 | 86 | { |
| 87 | - throw new InvalidArgumentException( sprintf( |
|
| 87 | + throw new InvalidArgumentException(sprintf( |
|
| 88 | 88 | "Attempted to set/access the property %s like an array, but is of type: %s", |
| 89 | 89 | $key, |
| 90 | - gettype( $movingTarget[ $key ] ) |
|
| 91 | - ) ); |
|
| 90 | + gettype($movingTarget[$key]) |
|
| 91 | + )); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = []; |
|
| 94 | + if (!$isset || !is_array($movingTarget[$key])) $movingTarget[$key] = []; |
|
| 95 | 95 | |
| 96 | - $movingTarget = &$movingTarget[ $key ]; |
|
| 96 | + $movingTarget = &$movingTarget[$key]; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $movingTarget = $value; |
@@ -106,9 +106,9 @@ discard block |
||
| 106 | 106 | * |
| 107 | 107 | * @return array |
| 108 | 108 | */ |
| 109 | - protected function parseDotNotation( $string ) |
|
| 109 | + protected function parseDotNotation($string) |
|
| 110 | 110 | { |
| 111 | - return explode( '.', strval( $string ) ); |
|
| 111 | + return explode('.', strval($string)); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -125,9 +125,9 @@ discard block |
||
| 125 | 125 | * |
| 126 | 126 | * @return string |
| 127 | 127 | */ |
| 128 | - public function toJson( $options = 0, $depth = 512 ) |
|
| 128 | + public function toJson($options = 0, $depth = 512) |
|
| 129 | 129 | { |
| 130 | - return json_encode( $this, $options, $depth ); |
|
| 130 | + return json_encode($this, $options, $depth); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | * |
| 136 | 136 | * @return static |
| 137 | 137 | */ |
| 138 | - public static function newFromArray( array $data ) |
|
| 138 | + public static function newFromArray(array $data) |
|
| 139 | 139 | { |
| 140 | - return new static( $data ); |
|
| 140 | + return new static($data); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -145,9 +145,9 @@ discard block |
||
| 145 | 145 | * |
| 146 | 146 | * @return static |
| 147 | 147 | */ |
| 148 | - public static function newFromStdObject( \stdClass $data ) |
|
| 148 | + public static function newFromStdObject(\stdClass $data) |
|
| 149 | 149 | { |
| 150 | - return new static( json_decode( json_encode( $data ), TRUE ) ); |
|
| 150 | + return new static(json_decode(json_encode($data), TRUE)); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | /** |
@@ -176,17 +176,17 @@ discard block |
||
| 176 | 176 | * The return value will be casted to boolean if non-boolean was returned. |
| 177 | 177 | * @since 5.0.0 |
| 178 | 178 | */ |
| 179 | - public function offsetExists( $offset ) |
|
| 179 | + public function offsetExists($offset) |
|
| 180 | 180 | { |
| 181 | 181 | $movingTarget = $this->data; |
| 182 | 182 | |
| 183 | - foreach ( $this->parseDotNotation( $offset ) as $i ) |
|
| 183 | + foreach ($this->parseDotNotation($offset) as $i) |
|
| 184 | 184 | { |
| 185 | - if ( ! isset( $movingTarget[ $i ] ) ) return FALSE; |
|
| 186 | - $movingTarget = $movingTarget[ $i ]; |
|
| 185 | + if (!isset($movingTarget[$i])) return FALSE; |
|
| 186 | + $movingTarget = $movingTarget[$i]; |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - return isset( $movingTarget ); |
|
| 189 | + return isset($movingTarget); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | /** |
@@ -200,9 +200,9 @@ discard block |
||
| 200 | 200 | * @return mixed Can return all value types. |
| 201 | 201 | * @since 5.0.0 |
| 202 | 202 | */ |
| 203 | - public function offsetGet( $offset ) |
|
| 203 | + public function offsetGet($offset) |
|
| 204 | 204 | { |
| 205 | - return $this->get( $offset ); |
|
| 205 | + return $this->get($offset); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -219,9 +219,9 @@ discard block |
||
| 219 | 219 | * @return void |
| 220 | 220 | * @since 5.0.0 |
| 221 | 221 | */ |
| 222 | - public function offsetSet( $offset, $value ) |
|
| 222 | + public function offsetSet($offset, $value) |
|
| 223 | 223 | { |
| 224 | - $this->set( $offset, $value ); |
|
| 224 | + $this->set($offset, $value); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | /** |
@@ -235,21 +235,21 @@ discard block |
||
| 235 | 235 | * @return void |
| 236 | 236 | * @since 5.0.0 |
| 237 | 237 | */ |
| 238 | - public function offsetUnset( $offset ) |
|
| 238 | + public function offsetUnset($offset) |
|
| 239 | 239 | { |
| 240 | 240 | $movingTarget = &$this->data; |
| 241 | - $keys = $this->parseDotNotation( $offset ); |
|
| 242 | - $length = count( $keys ); |
|
| 241 | + $keys = $this->parseDotNotation($offset); |
|
| 242 | + $length = count($keys); |
|
| 243 | 243 | |
| 244 | - foreach ( $keys as $i => $key ) |
|
| 244 | + foreach ($keys as $i => $key) |
|
| 245 | 245 | { |
| 246 | - if ( $i === $length - 1 ) |
|
| 246 | + if ($i===$length-1) |
|
| 247 | 247 | { |
| 248 | - unset( $movingTarget[ $key ] ); |
|
| 248 | + unset($movingTarget[$key]); |
|
| 249 | 249 | } |
| 250 | 250 | else |
| 251 | 251 | { |
| 252 | - $movingTarget = &$movingTarget[ $key ]; |
|
| 252 | + $movingTarget = &$movingTarget[$key]; |
|
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | } |
@@ -259,6 +259,6 @@ discard block |
||
| 259 | 259 | */ |
| 260 | 260 | public function __toString() |
| 261 | 261 | { |
| 262 | - return json_encode( $this ); |
|
| 262 | + return json_encode($this); |
|
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | \ No newline at end of file |
@@ -33,7 +33,9 @@ discard block |
||
| 33 | 33 | foreach ( $indices as $index ) |
| 34 | 34 | { |
| 35 | 35 | $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess; |
| 36 | - if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL; |
|
| 36 | + if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) {
|
|
| 37 | + return NULL; |
|
| 38 | + } |
|
| 37 | 39 | |
| 38 | 40 | $movingTarget = $movingTarget[ $index ]; |
| 39 | 41 | } |
@@ -91,7 +93,9 @@ discard block |
||
| 91 | 93 | ) ); |
| 92 | 94 | } |
| 93 | 95 | |
| 94 | - if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = []; |
|
| 96 | + if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) {
|
|
| 97 | + $movingTarget[ $key ] = []; |
|
| 98 | + } |
|
| 95 | 99 | |
| 96 | 100 | $movingTarget = &$movingTarget[ $key ]; |
| 97 | 101 | } |
@@ -182,7 +186,9 @@ discard block |
||
| 182 | 186 | |
| 183 | 187 | foreach ( $this->parseDotNotation( $offset ) as $i ) |
| 184 | 188 | { |
| 185 | - if ( ! isset( $movingTarget[ $i ] ) ) return FALSE; |
|
| 189 | + if ( ! isset( $movingTarget[ $i ] ) ) {
|
|
| 190 | + return FALSE; |
|
| 191 | + } |
|
| 186 | 192 | $movingTarget = $movingTarget[ $i ]; |
| 187 | 193 | } |
| 188 | 194 | |
@@ -246,8 +252,7 @@ discard block |
||
| 246 | 252 | if ( $i === $length - 1 ) |
| 247 | 253 | { |
| 248 | 254 | unset( $movingTarget[ $key ] ); |
| 249 | - } |
|
| 250 | - else |
|
| 255 | + } else |
|
| 251 | 256 | { |
| 252 | 257 | $movingTarget = &$movingTarget[ $key ]; |
| 253 | 258 | } |
