adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing view files finding and making tests pass

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-12-18 22:09:08 -04:30
parent ad78f1dc74
commit 151a4bdb33
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/View/HelperCollection.php
View file

@ -54,11 +54,11 @@ class HelperCollection extends ObjectCollection {
return $this->_loaded[$name]; return $this->_loaded[$name];
} }
$helperClass = $name . 'Helper'; $helperClass = $name . 'Helper';
App::uses($helperClass, 'View/Helper'); App::uses($helperClass, $plugin . 'View/Helper');
if (!class_exists($helperClass)) { if (!class_exists($helperClass)) {
throw new MissingHelperClassException(array( throw new MissingHelperClassException(array(
'class' => $helperClass, 'class' => $helperClass,
'file' => Inflector::underscore($name) . '.php' 'file' => $helperClass . '.php'
)); ));
} }
$this->_loaded[$name] = new $helperClass($this->_View, $settings); $this->_loaded[$name] = new $helperClass($this->_View, $settings);

6
lib/Cake/View/View.php
View file

@ -803,7 +803,7 @@ class View extends Object {
} }
$paths = array(); $paths = array();
$viewPaths = App::path('View'); $viewPaths = App::path('View');
$corePaths = array_flip(App::core('views')); $corePaths = array_flip(App::core('View'));
if (!empty($plugin)) { if (!empty($plugin)) {
$count = count($viewPaths); $count = count($viewPaths);
@ -812,10 +812,10 @@ class View extends Object {
$paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS; $paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS;
} }
} }
$paths[] = App::pluginPath($plugin) . 'views' . DS; $paths = array_merge($paths, App::path('View', $plugin));
} }
$this->__paths = array_merge($paths, $viewPaths, array_flip($corePaths)); $this->__paths = array_unique(array_merge($paths, $viewPaths, array_keys($corePaths)));
return $this->__paths; return $this->__paths;
} }
} }

4
lib/Cake/tests/cases/libs/view/view.test.php
View file

@ -204,7 +204,7 @@ class ViewTest extends CakeTestCase {
'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
'views' => array( 'views' => array(
TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS TEST_CAKE_CORE_INCLUDE_PATH . 'View' . DS
) )
), true); ), true);
@ -268,7 +268,7 @@ class ViewTest extends CakeTestCase {
TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'plugins' . DS . 'test_plugin' . DS, TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'plugins' . DS . 'test_plugin' . DS,
TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'views' . DS, TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'views' . DS,
TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS, TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS,
TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS TEST_CAKE_CORE_INCLUDE_PATH . 'View' . DS
); );
$this->assertEqual($paths, $expected); $this->assertEqual($paths, $expected);
} }