Permalink
Browse files

Merge pull request #1002 from dereuromark/2.3-new-lines

unify new lines at the end of the file
  • Loading branch information...
2 parents 5ccba46 + 881127e commit 8e6909625fb03a01ef9ca4f9a53cce6bdd05fc5d @markstory markstory committed Dec 6, 2012
View
1 lib/Cake/Cache/Cache.php
@@ -498,4 +498,3 @@ public static function settings($name = 'default') {
}
}
-
View
1 lib/Cake/Controller/Component/CookieComponent.php
@@ -529,4 +529,3 @@ protected function _explode($string) {
return $array;
}
}
-
View
2 lib/Cake/Model/Aco.php
@@ -38,4 +38,4 @@ class Aco extends AclNode {
* @var array
*/
public $hasAndBelongsToMany = array('Aro' => array('with' => 'Permission'));
-}
+}
View
2 lib/Cake/Model/AcoAction.php
@@ -38,4 +38,4 @@ class AcoAction extends AppModel {
* @var array
*/
public $belongsTo = array('Aco');
-}
+}
View
1 lib/Cake/Model/ModelBehavior.php
@@ -233,4 +233,3 @@ protected function _addToWhitelist(Model $model, $field) {
}
}
-
View
2 lib/Cake/Routing/Filter/AssetDispatcher.php
@@ -167,4 +167,4 @@ protected function _deliverAsset(CakeResponse $response, $assetFile, $ext) {
}
}
-}
+}
View
2 lib/Cake/Test/Case/AllConsoleTest.php
@@ -41,4 +41,4 @@ public static function suite() {
$suite->addTestFile($path . 'AllShellsTest.php');
return $suite;
}
-}
+}
View
2 lib/Cake/Test/Case/AllControllerTest.php
@@ -41,4 +41,4 @@ public static function suite() {
$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ControllerMergeVarsTest.php');
return $suite;
}
-}
+}
View
1 lib/Cake/Test/Case/AllCoreTest.php
@@ -38,4 +38,3 @@ public static function suite() {
return $suite;
}
}
-
View
1 lib/Cake/Test/Case/AllEventTest.php
@@ -37,4 +37,3 @@ public static function suite() {
return $suite;
}
}
-
View
1 lib/Cake/Test/Case/AllLogTest.php
@@ -38,4 +38,3 @@ public static function suite() {
return $suite;
}
}
-
View
2 lib/Cake/Test/Case/AllTestSuiteTest.php
@@ -37,4 +37,4 @@ public static function suite() {
$suite->addTestDirectory(CORE_TEST_CASES . DS . 'TestSuite');
return $suite;
}
-}
+}
View
2 lib/Cake/Test/Case/Console/AllConsoleLibsTest.php
@@ -45,4 +45,4 @@ public static function suite() {
}
return $suite;
}
-}
+}
View
2 lib/Cake/Test/Case/Console/AllShellsTest.php
@@ -39,4 +39,4 @@ public static function suite() {
$suite->addTestDirectory($path);
return $suite;
}
-}
+}
View
1 lib/Cake/Test/Case/Console/AllTasksTest.php
@@ -39,4 +39,3 @@ public static function suite() {
return $suite;
}
}
-
View
1 lib/Cake/Test/Case/Controller/Component/Acl/IniAclTest.php
@@ -66,4 +66,3 @@ public function testCheckArray() {
$this->assertTrue($Ini->check($user, 'posts'));
}
}
-
View
2 lib/Cake/Test/Case/Event/CakeEventTest.php
@@ -82,4 +82,4 @@ public function testEventDirectPropertyAccess() {
$this->assertEquals($this, $event->subject);
$this->assertEquals('fake.event', $event->name);
}
-}
+}
View
2 lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php
@@ -73,5 +73,3 @@ public function testAftersaveCallback() {
$this->assertEquals($expected, $result[7]);
}
}
-
-
View
2 lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
@@ -114,4 +114,4 @@ public function testDestroy() {
$this->assertFalse(Cache::read('test_one', 'session_test'), 'Value stuck around.');
}
-}
+}
View
2 lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
@@ -74,4 +74,4 @@ public function testSend() {
$this->assertEquals($data, $result['message']);
}
-}
+}
View
1 lib/Cake/Test/Case/Network/Email/MailTransportTest.php
@@ -81,4 +81,3 @@ public function testSendData() {
}
}
-
View
1 lib/Cake/Test/Case/View/Helper/TextHelperTest.php
@@ -334,4 +334,3 @@ public function testAutoLinkEmailInvalid() {
}
}
-
View
2 lib/Cake/TestSuite/Fixture/CakeTestModel.php
@@ -67,4 +67,4 @@ public function save($data = null, $validate = true, $fieldList = array()) {
return parent::save($data, $validate, $fieldList);
}
-}
+}
View
10 lib/Cake/TestSuite/templates/footer.php
@@ -18,13 +18,13 @@
*/
?> </div>
</div>
- <div id="footer">
+ <div id="footer">
<p>
- <!--PLEASE USE ONE OF THE POWERED BY CAKEPHP LOGO-->
- <a href="http://www.cakephp.org/" target="_blank">
+ <!--PLEASE USE ONE OF THE POWERED BY CAKEPHP LOGO-->
+ <a href="http://www.cakephp.org/" target="_blank">
<img src="<?php echo $baseDir; ?>img/cake.power.gif" alt="CakePHP(tm) :: Rapid Development Framework" /></a>
</p>
- </div>
+ </div>
<?php
App::uses('View', 'View');
$null = null;
@@ -33,4 +33,4 @@
?>
</div>
</body>
-</html>
+</html>
View
1 lib/Cake/TestSuite/templates/xdebug.php
@@ -25,4 +25,3 @@
</div>
<?php
include dirname(__FILE__) . DS . 'footer.php';
-
View
1 lib/Cake/bootstrap.php
@@ -423,4 +423,3 @@ function mb_encode_mimeheader($str, $charset = 'UTF-8', $transferEncoding = 'B',
}
}
-

0 comments on commit 8e69096

Please sign in to comment.