brmlab/brmsklad
4
0
Fork 0
mirror of https://github.com/brmlab/brmsklad.git synced 2025-08-02 14:23:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade CakePHP from 2.2.5 to 2.9.5

Browse source
This commit is contained in:
Brm Ko 2017-02-26 15:29:44 +01:00
parent 5a580df460
commit 235a541597
793 changed files with 60746 additions and 23753 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/Cake/TestSuite/CakeTestLoader.php
View file

@ -4,18 +4,17 @@
*
* Turns partial paths used on the testsuite console and web UI into full file paths.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @package Cake.TestSuite
*/
@ -31,8 +30,8 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
/**
* Load a file and find the first test case / suite in that file.
*
* @param string $filePath
* @param string $params
* @param string $filePath The file path to load
* @param string $params Additional parameters
* @return ReflectionClass
*/
public function load($filePath, $params = '') {
@ -41,9 +40,11 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
}
/**
* Convert path fragments used by Cake's test runner to absolute paths that can be fed to PHPUnit.
* Convert path fragments used by CakePHP's test runner to absolute paths that can be fed to PHPUnit.
*
* @return void
* @param string $filePath The file path to load.
* @param string $params Additional parameters.
* @return string Converted path fragments.
*/
protected function _resolveTestFile($filePath, $params) {
$basePath = $this->_basePath($params) . DS . $filePath;
@ -54,7 +55,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
/**
* Generates the base path to a set of tests based on the parameters.
*
* @param array $params
* @param array $params The path parameters.
* @return string The base path.
*/
protected static function _basePath($params) {
@ -80,11 +81,12 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
/**
* Get the list of files for the test listing.
*
* @return void
* @param string $params Path parameters
* @return array
*/
public static function generateTestList($params) {
$directory = self::_basePath($params);
$fileList = self::_getRecursiveFileList($directory);
$directory = static::_basePath($params);
$fileList = static::_getRecursiveFileList($directory);
$testCases = array();
foreach ($fileList as $testCaseFile) {
@ -101,7 +103,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
* a given fileTestFunction, like isTestCaseFile()
*
* @param string $directory The directory to scan for files.
* @param mixed $fileTestFunction
* @return array
*/
protected static function _getRecursiveFileList($directory = '.') {
$fileList = array();