@@ -64,9 +64,9 @@ |
||
64 | 64 | if ($value === false || $value === null || $value === '') { |
65 | 65 | continue; |
66 | 66 | } |
67 | - $out .= $key . ': ' . $value . $eol; |
|
67 | + $out .= $key.': '.$value.$eol; |
|
68 | 68 | } |
69 | - if (!empty($out)) { |
|
69 | + if ( ! empty($out)) { |
|
70 | 70 | $out = substr($out, 0, -1 * strlen($eol)); |
71 | 71 | } |
72 | 72 | return $out; |
@@ -33,7 +33,7 @@ |
||
33 | 33 | public function send(CakeEmail $email) { |
34 | 34 | $headers = $email->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'subject')); |
35 | 35 | $headers = $this->_headersToString($headers); |
36 | - $message = implode("\r\n", (array)$email->message()); |
|
36 | + $message = implode("\r\n", (array) $email->message()); |
|
37 | 37 | return array('headers' => $headers, 'message' => $message); |
38 | 38 | } |
39 | 39 |
@@ -66,14 +66,14 @@ |
||
66 | 66 | protected function _mail($to, $subject, $message, $headers, $params = null) { |
67 | 67 | if (ini_get('safe_mode')) { |
68 | 68 | //@codingStandardsIgnoreStart |
69 | - if (!@mail($to, $subject, $message, $headers)) { |
|
69 | + if ( ! @mail($to, $subject, $message, $headers)) { |
|
70 | 70 | $error = error_get_last(); |
71 | - $msg = 'Could not send email: ' . isset($error['message']) ? $error['message'] : 'unknown'; |
|
71 | + $msg = 'Could not send email: '.isset($error['message']) ? $error['message'] : 'unknown'; |
|
72 | 72 | throw new SocketException($msg); |
73 | 73 | } |
74 | - } elseif (!@mail($to, $subject, $message, $headers, $params)) { |
|
74 | + } elseif ( ! @mail($to, $subject, $message, $headers, $params)) { |
|
75 | 75 | $error = error_get_last(); |
76 | - $msg = 'Could not send email: ' . isset($error['message']) ? $error['message'] : 'unknown'; |
|
76 | + $msg = 'Could not send email: '.isset($error['message']) ? $error['message'] : 'unknown'; |
|
77 | 77 | //@codingStandardsIgnoreEnd |
78 | 78 | throw new SocketException($msg); |
79 | 79 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | * @return string |
60 | 60 | */ |
61 | 61 | protected static function _generateHeader($user, $pass) { |
62 | - return 'Basic ' . base64_encode($user . ':' . $pass); |
|
62 | + return 'Basic '.base64_encode($user.':'.$pass); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public static function authentication(HttpSocket $http, &$authInfo) { |
35 | 35 | if (isset($authInfo['user'], $authInfo['pass'])) { |
36 | - if (!isset($authInfo['realm']) && !self::_getServerInformation($http, $authInfo)) { |
|
36 | + if ( ! isset($authInfo['realm']) && ! self::_getServerInformation($http, $authInfo)) { |
|
37 | 37 | return; |
38 | 38 | } |
39 | 39 | $http->request['header']['Authorization'] = self::_generateHeader($http, $authInfo); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | foreach ($matches as $match) { |
62 | 62 | $authInfo[$match[1]] = $match[2]; |
63 | 63 | } |
64 | - if (!empty($authInfo['qop']) && empty($authInfo['nc'])) { |
|
64 | + if ( ! empty($authInfo['qop']) && empty($authInfo['nc'])) { |
|
65 | 65 | $authInfo['nc'] = 1; |
66 | 66 | } |
67 | 67 | return true; |
@@ -75,28 +75,28 @@ discard block |
||
75 | 75 | * @return string |
76 | 76 | */ |
77 | 77 | protected static function _generateHeader(HttpSocket $http, &$authInfo) { |
78 | - $a1 = md5($authInfo['user'] . ':' . $authInfo['realm'] . ':' . $authInfo['pass']); |
|
79 | - $a2 = md5($http->request['method'] . ':' . $http->request['uri']['path']); |
|
78 | + $a1 = md5($authInfo['user'].':'.$authInfo['realm'].':'.$authInfo['pass']); |
|
79 | + $a2 = md5($http->request['method'].':'.$http->request['uri']['path']); |
|
80 | 80 | |
81 | 81 | if (empty($authInfo['qop'])) { |
82 | - $response = md5($a1 . ':' . $authInfo['nonce'] . ':' . $a2); |
|
82 | + $response = md5($a1.':'.$authInfo['nonce'].':'.$a2); |
|
83 | 83 | } else { |
84 | 84 | $authInfo['cnonce'] = uniqid(); |
85 | 85 | $nc = sprintf('%08x', $authInfo['nc']++); |
86 | - $response = md5($a1 . ':' . $authInfo['nonce'] . ':' . $nc . ':' . $authInfo['cnonce'] . ':auth:' . $a2); |
|
86 | + $response = md5($a1.':'.$authInfo['nonce'].':'.$nc.':'.$authInfo['cnonce'].':auth:'.$a2); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | $authHeader = 'Digest '; |
90 | - $authHeader .= 'username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $authInfo['user']) . '", '; |
|
91 | - $authHeader .= 'realm="' . $authInfo['realm'] . '", '; |
|
92 | - $authHeader .= 'nonce="' . $authInfo['nonce'] . '", '; |
|
93 | - $authHeader .= 'uri="' . $http->request['uri']['path'] . '", '; |
|
94 | - $authHeader .= 'response="' . $response . '"'; |
|
95 | - if (!empty($authInfo['opaque'])) { |
|
96 | - $authHeader .= ', opaque="' . $authInfo['opaque'] . '"'; |
|
90 | + $authHeader .= 'username="'.str_replace(array('\\', '"'), array('\\\\', '\\"'), $authInfo['user']).'", '; |
|
91 | + $authHeader .= 'realm="'.$authInfo['realm'].'", '; |
|
92 | + $authHeader .= 'nonce="'.$authInfo['nonce'].'", '; |
|
93 | + $authHeader .= 'uri="'.$http->request['uri']['path'].'", '; |
|
94 | + $authHeader .= 'response="'.$response.'"'; |
|
95 | + if ( ! empty($authInfo['opaque'])) { |
|
96 | + $authHeader .= ', opaque="'.$authInfo['opaque'].'"'; |
|
97 | 97 | } |
98 | - if (!empty($authInfo['qop'])) { |
|
99 | - $authHeader .= ', qop="auth", nc=' . $nc . ', cnonce="' . $authInfo['cnonce'] . '"'; |
|
98 | + if ( ! empty($authInfo['qop'])) { |
|
99 | + $authHeader .= ', qop="auth", nc='.$nc.', cnonce="'.$authInfo['cnonce'].'"'; |
|
100 | 100 | } |
101 | 101 | return $authHeader; |
102 | 102 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | $assetFile = $this->_getAssetFile($url); |
55 | - if ($assetFile === null || !file_exists($assetFile)) { |
|
55 | + if ($assetFile === null || ! file_exists($assetFile)) { |
|
56 | 56 | return null; |
57 | 57 | } |
58 | 58 | |
@@ -96,12 +96,12 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | if ($isCss) { |
99 | - include WWW_ROOT . DS . $filters['css']; |
|
99 | + include WWW_ROOT.DS.$filters['css']; |
|
100 | 100 | return $response; |
101 | 101 | } |
102 | 102 | |
103 | 103 | if ($isJs) { |
104 | - include WWW_ROOT . DS . $filters['js']; |
|
104 | + include WWW_ROOT.DS.$filters['js']; |
|
105 | 105 | return $response; |
106 | 106 | } |
107 | 107 | } |
@@ -118,16 +118,16 @@ discard block |
||
118 | 118 | $themeName = $parts[1]; |
119 | 119 | unset($parts[0], $parts[1]); |
120 | 120 | $fileFragment = implode(DS, $parts); |
121 | - $path = App::themePath($themeName) . 'webroot' . DS; |
|
122 | - return $path . $fileFragment; |
|
121 | + $path = App::themePath($themeName).'webroot'.DS; |
|
122 | + return $path.$fileFragment; |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | $plugin = Inflector::camelize($parts[0]); |
126 | 126 | if ($plugin && CakePlugin::loaded($plugin)) { |
127 | 127 | unset($parts[0]); |
128 | 128 | $fileFragment = implode(DS, $parts); |
129 | - $pluginWebroot = CakePlugin::path($plugin) . 'webroot' . DS; |
|
130 | - return $pluginWebroot . $fileFragment; |
|
129 | + $pluginWebroot = CakePlugin::path($plugin).'webroot'.DS; |
|
130 | + return $pluginWebroot.$fileFragment; |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | } |
151 | 151 | $response->type($contentType); |
152 | 152 | } |
153 | - if (!$compressionEnabled) { |
|
153 | + if ( ! $compressionEnabled) { |
|
154 | 154 | $response->header('Content-Length', filesize($assetFile)); |
155 | 155 | } |
156 | 156 | $response->cache(filemtime($assetFile)); |
@@ -48,14 +48,14 @@ |
||
48 | 48 | } |
49 | 49 | $prefix = Configure::read('Cache.viewPrefix'); |
50 | 50 | if ($prefix) { |
51 | - $path = $prefix . '_' . $path; |
|
51 | + $path = $prefix.'_'.$path; |
|
52 | 52 | } |
53 | 53 | $path = strtolower(Inflector::slug($path)); |
54 | 54 | |
55 | - $filename = CACHE . 'views' . DS . $path . '.php'; |
|
55 | + $filename = CACHE.'views'.DS.$path.'.php'; |
|
56 | 56 | |
57 | - if (!file_exists($filename)) { |
|
58 | - $filename = CACHE . 'views' . DS . $path . '_index.php'; |
|
57 | + if ( ! file_exists($filename)) { |
|
58 | + $filename = CACHE.'views'.DS.$path.'_index.php'; |
|
59 | 59 | } |
60 | 60 | if (file_exists($filename)) { |
61 | 61 | $controller = null; |
@@ -33,8 +33,8 @@ |
||
33 | 33 | public static function suite() { |
34 | 34 | $suite = new CakeTestSuite('Model Behavior and all behaviors'); |
35 | 35 | |
36 | - $path = CORE_TEST_CASES . DS . 'Model' . DS . 'Behavior' . DS; |
|
37 | - $suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'BehaviorCollectionTest.php'); |
|
36 | + $path = CORE_TEST_CASES.DS.'Model'.DS.'Behavior'.DS; |
|
37 | + $suite->addTestFile(CORE_TEST_CASES.DS.'Model'.DS.'BehaviorCollectionTest.php'); |
|
38 | 38 | |
39 | 39 | $suite->addTestDirectory($path); |
40 | 40 | return $suite; |
@@ -32,8 +32,8 @@ |
||
32 | 32 | */ |
33 | 33 | public static function suite() { |
34 | 34 | $suite = new CakeTestSuite('All Cache related class tests'); |
35 | - $suite->addTestDirectory(CORE_TEST_CASES . DS . 'Cache'); |
|
36 | - $suite->addTestDirectory(CORE_TEST_CASES . DS . 'Cache' . DS . 'Engine'); |
|
35 | + $suite->addTestDirectory(CORE_TEST_CASES.DS.'Cache'); |
|
36 | + $suite->addTestDirectory(CORE_TEST_CASES.DS.'Cache'.DS.'Engine'); |
|
37 | 37 | return $suite; |
38 | 38 | } |
39 | 39 | } |