Fix method visibility

Author: kenjis

libraries/Twig.php

@@ -51,13 +51,13 @@ public function __construct($params = [])
 		$this->config = array_merge($this->config, $params);
 	}
 
-	public function resetTwig()
+	protected function resetTwig()
 	{
 		$this->twig = null;
 		$this->createTwig();
 	}
 
-	public function createTwig()
+	protected function createTwig()
 	{
 		// $this->twig is singleton
 		if ($this->twig !== null)
@@ -93,7 +93,7 @@ public function createTwig()
 		$this->twig = $twig;
 	}
 
-	public function setLoader($loader)
+	protected function setLoader($loader)
 	{
 		$this->loader = $loader;
 	}
@@ -140,7 +140,7 @@ public function render($view, $params = [])
 		return $this->twig->render($view, $params);
 	}
 
-	private function addCIFunctions()
+	protected function addCIFunctions()
 	{
 		// Runs only once
 		if ($this->add_ci_functions)
@@ -198,7 +198,7 @@ private function addCIFunctions()
 	 * @param array  $attributes [changed] only array is acceptable
 	 * @return string
 	 */
-	public function safe_anchor($uri = '', $title = '', $attributes = [])
+	protected function safe_anchor($uri = '', $title = '', $attributes = [])
 	{
 		$uri = html_escape($uri);
 		$title = html_escape($title);

phpunit.php

@@ -20,3 +20,6 @@
 copy('libraries/Twig.php', 'vendor/codeigniter/framework/application/libraries/Twig.php');
 
 require __DIR__ . '/ci_instance.php';
+
+// Load helper class for testing
+require __DIR__ . '/tests/ReflectionHelper.php';

tests/ReflectionHelper.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Part of CI PHPUnit Test
+ *
+ * @author     Kenji Suzuki <https://github.com/kenjis>
+ * @license    MIT License
+ * @copyright  2015 Kenji Suzuki
+ * @link       https://github.com/kenjis/ci-phpunit-test
+ */
+
+class ReflectionHelper
+{
+	/**
+	 * @param object|string $obj    object or class name
+	 * @param string        $method method name
+	 * @return closure
+	 */
+	public static function getPrivateMethodInvoker($obj, $method)
+	{
+		$ref_method = new ReflectionMethod($obj, $method);
+		$ref_method->setAccessible(true);
+		$obj = (gettype($obj) === 'object') ? $obj : null;
+
+		return function () use ($obj, $ref_method) {
+			$args = func_get_args();
+			return $ref_method->invokeArgs($obj, $args);
+		};
+	}
+
+	protected static function getAccessibleRefProperty($obj, $property)
+	{
+		if (is_object($obj)) {
+			$ref_class = new ReflectionObject($obj);
+		} else {
+			$ref_class = new ReflectionClass($obj);
+		}
+
+		$ref_property = $ref_class->getProperty($property);
+		$ref_property->setAccessible(true);
+
+		return $ref_property;
+	}
+
+	/**
+	 * @param object|string $obj      object or class name
+	 * @param string        $property property name
+	 * @param mixed         $value    value
+	 */
+	public static function setPrivateProperty($obj, $property, $value)
+	{
+		$ref_property = self::getAccessibleRefProperty($obj, $property);
+		$ref_property->setValue($obj, $value);
+	}
+
+	/**
+	 * @param object|string $obj      object or class name
+	 * @param string        $property property name
+	 * @return mixed value
+	 */
+	public static function getPrivateProperty($obj, $property)
+	{
+		$ref_property = self::getAccessibleRefProperty($obj, $property);
+		return $ref_property->getValue($obj);
+	}
+}

tests/libraries/TwigHelperTest.php

@@ -13,25 +13,36 @@ public static function setUpBeforeClass()
     public function setUp()
     {
         $CI =& get_instance();
-        
+
         $loader = new Twig_Loader_Array([
             'base_url' => '{{ base_url(\'"><s>abc</s><a name="test\') }}',
             'site_url' => '{{ site_url(\'"><s>abc</s><a name="test\') }}',
         ]);
-        $CI->twig->setLoader($loader);
-        $CI->twig->resetTwig();
-        
+        $setLoader = ReflectionHelper::getPrivateMethodInvoker(
+            $CI->twig, 'setLoader'
+        );
+        $setLoader($loader);
+
+        $resetTwig = ReflectionHelper::getPrivateMethodInvoker(
+            $CI->twig, 'resetTwig'
+        );
+        $resetTwig();
+
         $this->obj = $CI->twig;
         $this->twig = $CI->twig->getTwig();
     }
 
     public function test_safe_anchor()
     {
-        $actual = $this->obj->safe_anchor('news/local/123', 'My News', array('title' => 'The best news!'));
+        $safe_anchor = ReflectionHelper::getPrivateMethodInvoker(
+            $this->obj, 'safe_anchor'
+        );
+
+        $actual = $safe_anchor('news/local/123', 'My News', array('title' => 'The best news!'));
         $expected = '<a href="http://localhost/index.php/news/local/123" title="The best news!">My News</a>';
         $this->assertEquals($expected, $actual);
 
-        $actual = $this->obj->safe_anchor('news/local/123', '<s>abc</s>', array('<s>name</s>' => '<s>val</s>'));
+        $actual = $safe_anchor('news/local/123', '<s>abc</s>', array('<s>name</s>' => '<s>val</s>'));
         $expected = '<a href="http://localhost/index.php/news/local/123" &lt;s&gt;name&lt;/s&gt;="&lt;s&gt;val&lt;/s&gt;">&lt;s&gt;abc&lt;/s&gt;</a>';
         $this->assertEquals($expected, $actual);
     }