Rename Vendor -> vendor in files.

cakephp · Dec 2, 2012 · 402fddc · 402fddc
1 parent c012aeb
commit 402fddc
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 29 deletions.
diff --git a/App/vendor/empty b/App/vendor/empty
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -122,7 +122,7 @@ public function bake($plugin) {
 				'Test/Case/View/Helper',
 				'Test/Case/Model/Behavior',
 				'Test/Fixture',
-				'Vendor',
+				'vendor',
 				'webroot'
 			);
 

diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
@@ -695,8 +695,6 @@ protected function _checkUnitTest() {
 		} elseif (@include 'PHPUnit/Autoload.php') {
 			//@codingStandardsIgnoreEnd
 			return true;
-		} elseif (App::import('Vendor', 'phpunit', array('file' => 'PHPUnit/Autoload.php'))) {
-			return true;
 		}
 
 		$prompt = __d('cake_console', 'PHPUnit is not installed. Do you want to bake unit test files anyway?');

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
@@ -632,7 +632,7 @@ protected static function _packageFormat() {
 					'%s' . 'Locale' . DS
 				),
 				'Vendor' => array(
-					'%s' . 'Vendor' . DS,
+					'%s' . 'vendor' . DS,
 					dirname(dirname(CAKE)) . DS . 'vendors' . DS,
 				),
 				'Plugin' => array(

diff --git a/lib/Cake/Test/TestApp/Plugin/TestPlugin/Vendor/sample/sample_plugin.php b/lib/Cake/Test/TestApp/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.TestApp.Plugin.TestPlugin.Vendor.sample
+ * @package       Cake.Test.TestApp.Plugin.TestPlugin.vendor.sample
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

diff --git a/lib/Cake/Test/TestApp/Plugin/TestPlugin/Vendor/welcome.php b/lib/Cake/Test/TestApp/Plugin/TestPlugin/Vendor/welcome.php
@@ -12,9 +12,9 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.TestApp.Plugin.TestPlugin.Vendor
+ * @package       Cake.Test.TestApp.Plugin.TestPlugin.vendor
  * @since         CakePHP(tm) v 1.2.0.7629
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-This is the welcome.php file in test_plugin/vendors directory
+This is the welcome.php file in test_plugin/vendors directory
diff --git a/lib/Cake/Test/TestApp/Vendor/Test/MyTest.php b/lib/Cake/Test/TestApp/Vendor/Test/MyTest.php
@@ -12,9 +12,9 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.TestApp.Vendor.Test
+ * @package       Cake.Test.TestApp.vendor.Test
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-This is the MyTest.php file
+This is the MyTest.php file
diff --git a/lib/Cake/Test/TestApp/Vendor/Test/hello.php b/lib/Cake/Test/TestApp/Vendor/Test/hello.php
@@ -12,9 +12,9 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.TestApp.Vendor.Test
+ * @package       Cake.Test.TestApp.vendor.Test
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-This is the hello.php file in Test directory
+This is the hello.php file in Test directory
diff --git a/lib/Cake/Test/TestApp/Vendor/sample/configure_test_vendor_sample.php b/lib/Cake/Test/TestApp/Vendor/sample/configure_test_vendor_sample.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.TestApp.Vendor.sample
+ * @package       Cake.Test.TestApp.vendor.sample
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

diff --git a/lib/Cake/Test/TestApp/Vendor/somename/some.name.php b/lib/Cake/Test/TestApp/Vendor/somename/some.name.php
@@ -12,9 +12,9 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.TestApp.Vendor.somename
+ * @package       Cake.Test.TestApp.vendor.somename
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-This is a file with dot in file name
+This is a file with dot in file name
diff --git a/lib/Cake/Test/TestApp/Vendor/welcome.php b/lib/Cake/Test/TestApp/Vendor/welcome.php
@@ -12,9 +12,9 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.TestApp.Vendor
+ * @package       Cake.Test.TestApp.vendor
  * @since         CakePHP(tm) v 1.2.0.7629
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-This is the welcome.php file in vendors directory
+This is the welcome.php file in vendors directory
diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/PluginTaskTest.php
@@ -108,7 +108,7 @@ public function testBakeFoldersAndFiles() {
 			'Test/Case/View/Helper',
 			'Test/Case/Model/Behavior',
 			'Test/Fixture',
-			'Vendor',
+			'vendor',
 			'webroot'
 		);
 		foreach ($directories as $dir) {

diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/ProjectTaskTest.php
@@ -100,7 +100,7 @@ public function testBake() {
 			'Test/TestCase/View',
 			'Test/TestCase/View/Helper',
 			'Test/Fixture',
-			'Vendor',
+			'vendor',
 			'View',
 			'View/Helper',
 			'tmp',
@@ -184,7 +184,7 @@ public function testBakeEmptyFlag() {
 			'Test/TestCase/Controller/Component' => 'empty',
 			'Test/TestCase/View/Helper' => 'empty',
 			'Test/Fixture' => 'empty',
-			'Vendor' => 'empty',
+			'vendor' => 'empty',
 			'View/Elements' => 'empty',
 			'View/Scaffolds' => 'empty',
 			'tmp/cache/models' => 'empty',

diff --git a/lib/Cake/Test/TestCase/Core/AppTest.php b/lib/Cake/Test/TestCase/Core/AppTest.php
@@ -273,7 +273,7 @@ public function testPathWithPlugins() {
 		Plugin::load('TestPlugin');
 
 		$result = App::path('Vendor', 'TestPlugin');
-		$this->assertEquals($basepath . 'TestPlugin' . DS. 'Vendor' . DS, $result[0]);
+		$this->assertEquals($basepath . 'TestPlugin' . DS. 'vendor' . DS, $result[0]);
 	}
 
 /**

diff --git a/lib/Cake/Test/TestCase/Network/ResponseTest.php b/lib/Cake/Test/TestCase/Network/ResponseTest.php
@@ -1051,7 +1051,7 @@ public function testFile() {
 			->method('_isActive')
 			->will($this->returnValue(true));
 
-		$response->file(CAKE . 'Test/TestApp/Vendor/css/test_asset.css');
+		$response->file(CAKE . 'Test/TestApp/vendor/css/test_asset.css');
 
 		ob_start();
 		$result = $response->send();
@@ -1303,7 +1303,7 @@ public function testConnectionAbortedOnBuffering() {
 		$response->expects($this->once())->method('_clearBuffer');
 		$response->expects($this->never())->method('_flushBuffer');
 
-		$response->file(CAKE . 'Test/TestApp/Vendor/css/test_asset.css');
+		$response->file(CAKE . 'Test/TestApp/vendor/css/test_asset.css');
 
 		$result = $response->send();
 		$this->assertNull($result);
@@ -1335,7 +1335,7 @@ public function testFileUpperExtension() {
 			->method('_isActive')
 			->will($this->returnValue(true));
 
-		$response->file(CAKE . 'Test/TestApp/Vendor/img/test_2.JPG');
+		$response->file(CAKE . 'Test/TestApp/vendor/img/test_2.JPG');
 	}
 
 /**
@@ -1364,7 +1364,7 @@ public function testFileExtensionNotSet() {
 			->method('_isActive')
 			->will($this->returnValue(true));
 
-		$response->file(CAKE . 'Test/TestApp/Vendor/img/test_2.JPG');
+		$response->file(CAKE . 'Test/TestApp/vendor/img/test_2.JPG');
 	}
 
 }
diff --git a/lib/Cake/Test/TestCase/Routing/DispatcherTest.php b/lib/Cake/Test/TestCase/Routing/DispatcherTest.php
@@ -774,7 +774,7 @@ public function testAssets() {
 
 		App::build(array(
 			'Plugin' => array(CAKE . 'Test/TestApp/Plugin/'),
-			'Vendor' => array(CAKE . 'Test/TestApp/Vendor/'),
+			'Vendor' => array(CAKE . 'Test/TestApp/vendor/'),
 			'View' => array(CAKE . 'Test/TestApp/View/')
 		));
 		Plugin::load(array('TestPlugin', 'TestPluginTwo'));
@@ -892,7 +892,7 @@ public function testAsset($url, $file) {
 
 		App::build(array(
 			'Plugin' => array(CAKE . 'Test/TestApp/Plugin/'),
-			'Vendor' => array(CAKE . 'Test/TestApp/Vendor/'),
+			'Vendor' => array(CAKE . 'Test/TestApp/vendor/'),
 			'View' => array(CAKE . 'Test/TestApp/View/')
 		));
 		Plugin::load(array('TestPlugin', 'PluginJs'));

diff --git a/lib/Cake/Test/TestCase/View/MediaViewTest.php b/lib/Cake/Test/TestCase/View/MediaViewTest.php
@@ -63,7 +63,7 @@ public function tearDown() {
  */
 	public function testRender() {
 		$vars = array(
-			'path' => CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS,
+			'path' => CAKE . 'Test' . DS . 'test_app' . DS . 'vendor' . DS . 'css' . DS,
 			'id' => 'test_asset.css'
 		);
 		$this->MediaView->viewVars = $vars;
@@ -92,7 +92,7 @@ public function testRender() {
  */
 	public function testRenderCachingAndName() {
 		$vars = array(
-			'path' => CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS,
+			'path' => CAKE . 'Test' . DS . 'test_app' . DS . 'vendor' . DS . 'css' . DS,
 			'id' => 'test_asset.css',
 			'cache' => '+1 day',
 			'name' => 'something_special',
@@ -132,7 +132,7 @@ public function testRenderCachingAndName() {
 	public function testRenderUpperExtension() {
 		return;
 		$this->MediaView->viewVars = array(
-			'path' => CAKE . 'Test/TestApp/Vendor/img/',
+			'path' => CAKE . 'Test/TestApp/vendor/img/',
 			'id' => 'test_2.JPG'
 		);