Permalink
Browse files

fix coding standards

  • Loading branch information...
1 parent ec3e7af commit a8eca60fc52d73b114eacf08f9fa0be1c399df9d @ceeram ceeram committed Dec 10, 2012
View
@@ -2581,7 +2581,7 @@ public function exists($id = null) {
if ($id === false) {
return false;
}
- return (bool)$this->find('count', array(
+ return (bool)$this->find('count', array(
'conditions' => array(
$this->alias . '.' . $this->primaryKey => $id
),
@@ -880,22 +880,21 @@ public function testParseTrailingUTF8() {
$this->assertEquals($expected, $result);
}
-
/**
* test that utf-8 patterns work for :section
*
* @return void
*/
public function testUTF8PatternOnSection() {
$route = new CakeRoute(
- '/:section',
+ '/:section',
array('plugin' => 'blogs', 'controller' => 'posts' , 'action' => 'index' ),
array(
'persist' => array('section'),
'section' => 'آموزش|weblog'
)
);
-
+
$result = $route->parse('/%D8%A2%D9%85%D9%88%D8%B2%D8%B4');
$expected = array('section' => 'آموزش', 'plugin' => 'blogs', 'controller' => 'posts', 'action' => 'index', 'pass' => array(), 'named' => array());
$this->assertEquals($expected, $result);
@@ -130,7 +130,6 @@ public function testRenderCachingAndName() {
* @return void
*/
public function testRenderUpperExtension() {
- return;
$this->MediaView->viewVars = array(
'path' => CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'img' . DS,
'id' => 'test_2.JPG'
View
@@ -332,13 +332,10 @@ function env($key) {
$offset = 4;
}
return substr($filename, 0, -(strlen($name) + $offset));
- break;
case 'PHP_SELF':
return str_replace(env('DOCUMENT_ROOT'), '', env('SCRIPT_FILENAME'));
- break;
case 'CGI_MODE':
return (PHP_SAPI === 'cgi');
- break;
case 'HTTP_BASE':
$host = env('HTTP_HOST');
$parts = explode('.', $host);
@@ -378,7 +375,6 @@ function env($key) {
}
array_shift($parts);
return '.' . implode('.', $parts);
- break;
}
return null;
}

0 comments on commit a8eca60

Please sign in to comment.