Merge pull request #31 from HavokInspiration/accessing-helpers-fix

Update the TwigView::generateHelperList() method

composer.json

@@ -37,7 +37,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "WyriHaximus\\CakePHP\\Tests\\TwigView\\": "tests/"
+            "WyriHaximus\\CakePHP\\Tests\\TwigView\\": "tests/",
+            "App\\": "tests/test_app/"
         }
     }
 }

src/View/TwigView.php

@@ -164,7 +164,9 @@ protected function getLoader()
     protected function generateHelperList()
     {
         $registry = $this->helpers();
-        $helpers = $registry->normalizeArray($this->helpers);
+
+        $helpersList = array_merge($this->helpers, $registry->loaded());
+        $helpers = $registry->normalizeArray($helpersList);
         foreach ($helpers as $properties) {
             list(, $class) = pluginSplit($properties['class']);
             $this->helperList[$class] = $this->{$class};

tests/View/TwigViewTest.php

@@ -140,14 +140,17 @@ public function testGenerateHelperList()
 			]
 		);
 
-        $view = new TwigView(Phake::mock('Cake\Network\Request'), Phake::mock('Cake\Network\Response'), Phake::mock('Cake\Event\EventManager'));
-        $view->TestHelper = 'foo:bar';
-        $view->helpers = $helpersArray;
+		$view = new TwigView(Phake::mock('Cake\Network\Request'), Phake::mock('Cake\Network\Response'), Phake::mock('Cake\Event\EventManager'));
+		$view->TestHelper = 'foo:bar';
+		$view->helpers = $helpersArray;
+		$view->loadHelper('TestSecond');
+		$view->TestSecond = 'bar:foo';
 
 		self::getMethod('generateHelperList')->invoke($view);
 		$this->assertSame(
 			[
 				'TestHelper' => 'foo:bar',
+				'TestSecond' => 'bar:foo',
 			],
 			self::getProperty('helperList')->getValue($view)
 		);

tests/test_app/View/Helper/TestSecondHelper.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * This file is part of TwigView.
+ *
+ ** (c) 2014 Cees-Jan Kiewiet
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace App\View\Helper;
+
+use Cake\View\Helper;
+
+class TestSecondHelper extends Helper
+{
+}