From 932c9d4e2fffcccdd82648753334c1b6cf174dec Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 10 Mar 2012 22:29:35 -0500 Subject: [PATCH] Fix coding standards. --- lib/Cake/Test/Case/Cache/CacheTest.php | 1 - lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php | 3 +-- lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php | 11 ++++++----- .../Test/Case/Cache/Engine/MemcacheEngineTest.php | 4 +++- .../Test/Case/Cache/Engine/WincacheEngineTest.php | 3 +-- lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/Cake/Test/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php index 2ac0c18150a..b4cf662b2a6 100644 --- a/lib/Cake/Test/Case/Cache/CacheTest.php +++ b/lib/Cake/Test/Case/Cache/CacheTest.php @@ -126,7 +126,6 @@ public function testInvalidConfig() { $read = Cache::read('Test', 'invalid'); } - /** * Test reading from a config that is undefined. * diff --git a/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php index 1c4e4d3a149..a1db628b544 100644 --- a/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php @@ -106,7 +106,7 @@ public function testExpiry() { $result = Cache::read('other_test', 'apc'); $this->assertFalse($result); - Cache::set(array('duration' => 1), 'apc'); + Cache::set(array('duration' => 1), 'apc'); $data = 'this is a test of the emergency broadcasting system'; $result = Cache::write('other_test', $data, 'apc'); @@ -157,7 +157,6 @@ public function testDecrement() { $result = Cache::read('test_decrement', 'apc'); $this->assertEquals(2, $result); - } /** diff --git a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php index 735672db5e5..f327316d6ec 100644 --- a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php @@ -133,7 +133,7 @@ public function testExpiry() { $result = Cache::read('other_test', 'file_test'); $this->assertFalse($result); - Cache::set(array('duration' => "+1 second"), 'file_test'); + Cache::set(array('duration' => "+1 second"), 'file_test'); $data = 'this is a test of the emergency broadcasting system'; $result = Cache::write('other_test', $data, 'file_test'); @@ -362,7 +362,7 @@ public function testMaskSetting() { Cache::config('mask_test', array('engine' => 'File', 'path' => TMP . 'tests')); $data = 'This is some test content'; $write = Cache::write('masking_test', $data, 'mask_test'); - $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4); + $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4); $expected = '0664'; $this->assertEquals($expected, $result); Cache::delete('masking_test', 'mask_test'); @@ -370,7 +370,7 @@ public function testMaskSetting() { Cache::config('mask_test', array('engine' => 'File', 'mask' => 0666, 'path' => TMP . 'tests')); $write = Cache::write('masking_test', $data, 'mask_test'); - $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4); + $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4); $expected = '0666'; $this->assertEquals($expected, $result); Cache::delete('masking_test', 'mask_test'); @@ -378,7 +378,7 @@ public function testMaskSetting() { Cache::config('mask_test', array('engine' => 'File', 'mask' => 0644, 'path' => TMP . 'tests')); $write = Cache::write('masking_test', $data, 'mask_test'); - $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4); + $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4); $expected = '0644'; $this->assertEquals($expected, $result); Cache::delete('masking_test', 'mask_test'); @@ -386,10 +386,11 @@ public function testMaskSetting() { Cache::config('mask_test', array('engine' => 'File', 'mask' => 0640, 'path' => TMP . 'tests')); $write = Cache::write('masking_test', $data, 'mask_test'); - $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4); + $result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4); $expected = '0640'; $this->assertEquals($expected, $result); Cache::delete('masking_test', 'mask_test'); Cache::drop('mask_test'); } + } diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php index a61932b738b..4693815c68f 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php @@ -21,6 +21,7 @@ App::uses('MemcacheEngine', 'Cache/Engine'); class TestMemcacheEngine extends MemcacheEngine { + /** * public accessor to _parseServerString * @@ -34,6 +35,7 @@ public function parseServerString($server) { public function setMemcache($memcache) { $this->_Memcache = $memcache; } + } /** @@ -217,7 +219,7 @@ public function testExpiry() { $result = Cache::read('other_test', 'memcache'); $this->assertFalse($result); - Cache::set(array('duration' => "+1 second"), 'memcache'); + Cache::set(array('duration' => "+1 second"), 'memcache'); $data = 'this is a test of the emergency broadcasting system'; $result = Cache::write('other_test', $data, 'memcache'); diff --git a/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php index 4d235188987..7c1de875ce2 100644 --- a/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php @@ -91,7 +91,7 @@ public function testExpiry() { $result = Cache::read('other_test', 'wincache'); $this->assertFalse($result); - Cache::set(array('duration' => 1), 'wincache'); + Cache::set(array('duration' => 1), 'wincache'); $data = 'this is a test of the emergency broadcasting system'; $result = Cache::write('other_test', $data, 'wincache'); @@ -145,7 +145,6 @@ public function testDecrement() { $result = Cache::read('test_decrement', 'wincache'); $this->assertEquals(2, $result); - } /** diff --git a/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php index 372e3fc985d..8b7f4216b3e 100644 --- a/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php @@ -111,7 +111,7 @@ public function testExpiry() { $result = Cache::read('other_test'); $this->assertFalse($result); - Cache::set(array('duration' => "+1 second")); + Cache::set(array('duration' => "+1 second")); $data = 'this is a test of the emergency broadcasting system'; $result = Cache::write('other_test', $data);