| Test | @@ -150,13 +150,13 @@ public function getReport()
"; + return $tpl . '
'; } //-------------------------------------------------------------------- diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php index b638ff63cf5c..97101019803f 100644 --- a/system/Debug/Timer.php +++ b/system/Debug/Timer.php @@ -27,12 +27,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ @@ -65,16 +65,16 @@ class Timer * Multiple calls can be made to this method so that several * execution points can be measured. * - * @param string $name The name of this timer. - * @param float $time Allows user to provide time. + * @param string $name The name of this timer. + * @param float $time Allows user to provide time. * * @return Timer */ public function start(string $name, float $time = null) { $this->timers[strtolower($name)] = [ - 'start' => ! empty($time) ? $time : microtime(true), - 'end' => null, + 'start' => ! empty($time) ? $time : microtime(true), + 'end' => null, ]; return $this; @@ -88,7 +88,7 @@ public function start(string $name, float $time = null) * If the timer is not stopped before the timers() method is called, * it will be automatically stopped at that point. * - * @param string $name The name of this timer. + * @param string $name The name of this timer. * * @return Timer */ @@ -111,8 +111,8 @@ public function stop(string $name) /** * Returns the duration of a recorded timer. * - * @param string $name The name of the timer. - * @param int $decimals Number of decimal places. + * @param string $name The name of the timer. + * @param integer $decimals Number of decimal places. * * @return null|float Returns null if timer exists by that name. * Returns a float representing the number of @@ -142,7 +142,7 @@ public function getElapsedTime(string $name, int $decimals = 4) /** * Returns the array of timers, with the duration pre-calculated for you. * - * @param int $decimals Number of decimal places + * @param integer $decimals Number of decimal places * * @return array */ @@ -170,7 +170,7 @@ public function getTimers(int $decimals = 4) * * @param string $name * - * @return bool + * @return boolean */ public function has(string $name) { diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index 926000661bb4..f3d9b284bb82 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -27,14 +27,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ + use Config\App; use Config\Services; use CodeIgniter\Config\BaseConfig; @@ -79,8 +80,8 @@ public function __construct(BaseConfig $config) { if (! class_exists($collector)) { - log_message('critical', 'Toolbar collector does not exists(' . $collector . ').'. - 'please check $toolbarCollectors in the Config\App.php file.'); + log_message('critical', 'Toolbar collector does not exists(' . $collector . ').' . + 'please check $toolbarCollectors in the Config\App.php file.'); continue; } @@ -93,7 +94,7 @@ public function __construct(BaseConfig $config) /** * Returns all the data required by Debug Bar * - * @param float $startTime App start time + * @param float $startTime App start time * @param float $totalTime * @param \CodeIgniter\HTTP\RequestInterface $request * @param \CodeIgniter\HTTP\ResponseInterface $response @@ -107,14 +108,14 @@ public function run($startTime, $totalTime, $request, $response): string $data['method'] = $request->getMethod(true); $data['isAJAX'] = $request->isAJAX(); $data['startTime'] = $startTime; - $data['totalTime'] = $totalTime*1000; - $data['totalMemory'] = number_format((memory_get_peak_usage())/1024/1024, 3); - $data['segmentDuration'] = $this->roundTo($data['totalTime']/7, 5); - $data['segmentCount'] = (int)ceil($data['totalTime']/$data['segmentDuration']); + $data['totalTime'] = $totalTime * 1000; + $data['totalMemory'] = number_format((memory_get_peak_usage()) / 1024 / 1024, 3); + $data['segmentDuration'] = $this->roundTo($data['totalTime'] / 7, 5); + $data['segmentCount'] = (int)ceil($data['totalTime'] / $data['segmentDuration']); $data['CI_VERSION'] = \CodeIgniter\CodeIgniter::CI_VERSION; $data['collectors'] = []; - foreach($this->collectors as $collector) + foreach ($this->collectors as $collector) { $data['collectors'][] = [ 'title' => $collector->getTitle(), @@ -187,17 +188,17 @@ public function run($startTime, $totalTime, $request, $response): string $data['vars']['cookies'][esc($name)] = esc($value); } - $data['vars']['request'] = ($request->isSecure() ? 'HTTPS' : 'HTTP').'/'.$request->getProtocolVersion(); + $data['vars']['request'] = ($request->isSecure() ? 'HTTPS' : 'HTTP') . '/' . $request->getProtocolVersion(); $data['vars']['response'] = [ - 'statusCode' => $response->getStatusCode(), - 'reason' => esc($response->getReason()), - 'contentType' => esc($response->getHeaderLine('content-type')), + 'statusCode' => $response->getStatusCode(), + 'reason' => esc($response->getReason()), + 'contentType' => esc($response->getHeaderLine('content-type')), ]; $data['config'] = \CodeIgniter\Debug\Toolbar\Collectors\Config::display(); - if( $response->CSP !== null ) + if ($response->CSP !== null) { $response->CSP->addImageSrc( 'data:' ); } @@ -210,8 +211,8 @@ public function run($startTime, $totalTime, $request, $response): string /** * Format output * - * @param string $data JSON encoded Toolbar data - * @param string $format html, json, xml + * @param string $data JSON encoded Toolbar data + * @param string $format html, json, xml * * @return string */ @@ -220,7 +221,7 @@ protected static function format(string $data, string $format = 'html') $data = json_decode($data, true); // History must be loaded on the fly - $filenames = glob(WRITEPATH.'debugbar/debugbar_*'); + $filenames = glob(WRITEPATH . 'debugbar/debugbar_*'); $total = count($filenames); rsort($filenames); @@ -231,12 +232,12 @@ protected static function format(string $data, string $format = 'html') for ($i = 0; $i < $total; $i++) { - // Oldest files will be deleted - if ($app->toolbarMaxHistory >= 0 && $i+1 > $app->toolbarMaxHistory) + // Oldest files will be deleted + if ($app->toolbarMaxHistory >= 0 && $i + 1 > $app->toolbarMaxHistory) { unlink($filenames[$i]); continue; - } + } // Get the contents of this specific history request ob_start(); @@ -250,7 +251,7 @@ protected static function format(string $data, string $format = 'html') $files[] = [ 'time' => (int)$time = substr($filenames[$i], -10), 'datetime' => date('Y-m-d H:i:s', $time), - 'active' => (int)($time == $current), + 'active' => (int)($time === $current), 'status' => $file['vars']['response']['statusCode'], 'method' => $file['method'], 'url' => $file['url'], @@ -260,7 +261,7 @@ protected static function format(string $data, string $format = 'html') } // Set the History here. Class is not necessary - $data['collectors'][] = [ + $data['collectors'][] = [ 'title' => 'History', 'titleSafe' => 'history', 'titleDetails' => '', @@ -281,9 +282,9 @@ protected static function format(string $data, string $format = 'html') case 'html': $data['styles'] = []; extract($data); - $parser = Services::parser(BASEPATH . 'Debug/Toolbar/Views/', null,false); + $parser = Services::parser(BASEPATH . 'Debug/Toolbar/Views/', null, false); ob_start(); - include(__DIR__.'/Toolbar/Views/toolbar.tpl.php'); + include(__DIR__ . '/Toolbar/Views/toolbar.tpl.php'); $output = ob_get_contents(); ob_end_clean(); break; @@ -304,36 +305,36 @@ protected static function format(string $data, string $format = 'html') /** * Called within the view to display the timeline itself. * - * @param array $collectors - * @param float $startTime - * @param int $segmentCount - * @param int $segmentDuration + * @param array $collectors + * @param float $startTime + * @param integer $segmentCount + * @param integer $segmentDuration * * @return string */ - protected static function renderTimeline(array $collectors, $startTime, int $segmentCount, int $segmentDuration, array& $styles ): string + protected static function renderTimeline(array $collectors, $startTime, int $segmentCount, int $segmentDuration, array& $styles): string { - $displayTime = $segmentCount*$segmentDuration; + $displayTime = $segmentCount * $segmentDuration; $rows = self::collectTimelineData($collectors); $output = ''; - $styleCount = 0; + $styleCount = 0; foreach ($rows as $row) { - $output .= "
@@ -133,7 +133,7 @@
-
+
$value) : ?>
-
tags - * - Converts single and double quotes into correctly facing curly quote entities. - * - Converts three dots into ellipsis. - * - Converts double dashes into em-dashes. + * - Converts double spaces into paragraphs. + * - Converts single line breaks into
tags + * - Converts single and double quotes into correctly facing curly quote entities. + * - Converts three dots into ellipsis. + * - Converts double dashes into em-dashes. * - Converts two spaces into entities * - * @param string $str - * @param bool $reduce_linebreaks whether to reduce more then two consecutive newlines to two + * @param string $str + * @param boolean $reduce_linebreaks whether to reduce more then two consecutive newlines to two * - * @return string + * @return string */ public function autoTypography(string $str, bool $reduce_linebreaks = false): string { @@ -125,10 +124,10 @@ public function autoTypography(string $str, bool $reduce_linebreaks = false): st $html_comments = []; if (strpos($str, ''; - $this->assertEquals('foo ', sanitize_filename($filename)); - } - - public function testStripImageTags() - { - $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif')); - - $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('
'));
- }
-
- function test_encode_php_tags()
- {
- $this->assertEquals('<? echo $foo; ?>', encode_php_tags(''));
- }
+ public function setUp()
+ {
+ parent::setUp();
+
+ helper('security');
+ }
+
+ public function testSanitizeFilenameSimpleSuccess()
+ {
+ $this->assertEquals('hello.doc', sanitize_filename('hello.doc'));
+ }
+
+ public function testSanitizeFilenameStripsExtras()
+ {
+ $filename = './';
+ $this->assertEquals('foo ', sanitize_filename($filename));
+ }
+
+ public function testStripImageTags()
+ {
+ $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif'));
+
+ $this->assertEquals('http://example.com/spacer.gif', strip_image_tags(''));
+ }
+
+ function test_encode_php_tags()
+ {
+ $this->assertEquals('<? echo $foo; ?>', encode_php_tags(''));
+ }
}
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index e1f0d3c04354..d62b0b192ccf 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -5,353 +5,362 @@
class TextHelperTest extends \CIUnitTestCase
{
- private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
-
- public function setUp()
- {
- parent::setUp();
-
- helper('text');
- }
-
- // --------------------------------------------------------------------
-
- public function test_strip_slashes()
- {
- $expected = [
- "Is your name O'reilly?",
- "No, my name is O'connor."
- ];
- $str = [
- "Is your name O\'reilly?",
- "No, my name is O\'connor."
- ];
- $this->assertEquals($expected, strip_slashes($str));
- }
-
- // --------------------------------------------------------------------
- public function test_strip_quotes()
- {
- $strs = [
- '"me oh my!"' => 'me oh my!',
- "it's a winner!" => 'its a winner!',
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, strip_quotes($str));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_quotes_to_entities()
- {
- $strs = [
- '"me oh my!"' => '"me oh my!"',
- "it's a winner!" => 'it's a winner!',
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, quotes_to_entities($str));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_reduce_double_slashes()
- {
- $strs = [
- 'http://codeigniter.com' => 'http://codeigniter.com',
- '//var/www/html/example.com/' => '/var/www/html/example.com/',
- '/var/www/html//index.php' => '/var/www/html/index.php'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, reduce_double_slashes($str));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_reduce_multiples()
- {
- $strs = [
- 'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
- 'Ringo, John, Paul,,' => 'Ringo, John, Paul,'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, reduce_multiples($str));
- }
- $strs = [
- 'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
- 'Ringo, John, Paul,,' => 'Ringo, John, Paul'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, reduce_multiples($str, ',', TRUE));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_random_string()
- {
- $this->assertEquals(16, strlen(random_string('alnum', 16)));
- $this->assertEquals(16, strlen(random_string('alpha', 16)));
- $this->assertEquals(16, strlen(random_string('nozero', 16)));
- $this->assertEquals(16, strlen(random_string('numeric', 16)));
- $this->assertEquals(8, strlen(random_string('numeric')));
-
- $this->assertInternalType('string', random_string('basic'));
- $this->assertEquals(16, strlen($random = random_string('crypto', 16)));
- $this->assertInternalType('string', $random);
-
- $this->assertEquals(32, strlen($random = random_string('md5')));
- $this->assertEquals(40, strlen($random = random_string('sha1')));
- }
-
- // --------------------------------------------------------------------
- public function test_increment_string()
- {
- $this->assertEquals('my-test_1', increment_string('my-test'));
- $this->assertEquals('my-test-1', increment_string('my-test', '-'));
- $this->assertEquals('file_5', increment_string('file_4'));
- $this->assertEquals('file-5', increment_string('file-4', '-'));
- $this->assertEquals('file-5', increment_string('file-4', '-'));
- $this->assertEquals('file-1', increment_string('file', '-', '1'));
- $this->assertEquals(124, increment_string('123', ''));
- }
-
- // -------------------------------------------------------------------
- // Functions from text_helper_test.php
- // -------------------------------------------------------------------
-
- public function test_word_limiter()
- {
- $this->assertEquals('Once upon a time,…', word_limiter($this->_long_string, 4));
- $this->assertEquals('Once upon a time,…', word_limiter($this->_long_string, 4, '…'));
- $this->assertEquals('', word_limiter('', 4));
- $this->assertEquals('Once upon a…', word_limiter($this->_long_string, 3, '…'));
- $this->assertEquals('Once upon a time', word_limiter('Once upon a time', 4, '…'));
- }
-
- // ------------------------------------------------------------------------
- public function test_character_limiter()
- {
- $this->assertEquals('Once upon a time, a…', character_limiter($this->_long_string, 20));
- $this->assertEquals('Once upon a time, a…', character_limiter($this->_long_string, 20, '…'));
- $this->assertEquals('Short', character_limiter('Short', 20));
- $this->assertEquals('Short', character_limiter('Short', 5));
- }
-
- // ------------------------------------------------------------------------
- public function test_ascii_to_entities()
- {
- $strs = [
- 'āā ātestā ' => '“‘ “test” ',
- 'ā Ā„ĀØĖĆøĆ„ĆāĘĀ©ĖāĖĀ¬' => '†¥¨ˆøåß∂ƒ©˙∆˚¬'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, ascii_to_entities($str));
- }
- }
-
- // ------------------------------------------------------------------------
- public function test_entities_to_ascii()
- {
- $strs = [
- '“‘ “test” ' => 'āā ātestā ',
- '†¥¨ˆøåß∂ƒ©˙∆˚¬' => 'ā Ā„ĀØĖĆøĆ„ĆāĘĀ©ĖāĖĀ¬'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, entities_to_ascii($str));
- }
- }
-
- public function testEntitiesToAsciiUnsafe()
- {
- $str = '<>';
- $this->assertEquals('<>', entities_to_ascii($str, true));
- $this->assertEquals('<>', entities_to_ascii($str, false));
- }
-
- public function testEntitiesToAsciiSmallOrdinals()
- {
- $str = '';
- $this->assertEquals(pack('c', 7), entities_to_ascii($str));
- }
-
- // ------------------------------------------------------------------------
- public function test_convert_accented_characters()
- {
- //$this->ci_vfs_clone('application/Config/ForeignChars.php');
- $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ĆĆĆĆĆĆĆĆĆÅĆĆĆÅø'));
- $this->assertEquals('a e i o u n ue', convert_accented_characters('Ć” Ć© Ć Ć³ Ćŗ Ʊ Ć¼'));
- }
-
- // ------------------------------------------------------------------------
- public function test_censored_words()
- {
- $censored = ['boob', 'nerd', 'ass', 'fart'];
- $strs = [
- 'Ted bobbled the ball' => 'Ted bobbled the ball',
- 'Jake is a nerdo' => 'Jake is a nerdo',
- 'The borg will assimilate you' => 'The borg will assimilate you',
- 'Did Mary Fart?' => 'Did Mary $*#?',
- 'Jake is really a boob' => 'Jake is really a $*#',
- 'Jake is really a (boob)' => 'Jake is really a ($*#)'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, word_censor($str, $censored, '$*#'));
- }
- // test censored words being sent as a string
- $this->assertEquals('this is a test', word_censor('this is a test', 'test'));
- }
-
- // ------------------------------------------------------------------------
- public function test_highlight_code()
- {
- $expect = "
www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - 'Visit example.com or email foo@bar.com'], - 'test08' => ['Visit www.example.com or email foo@bar.com', - 'Visit www.example.com or email foo@bar.com'], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + 'This is my noreply@codeigniter.com test', + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + 'Visit example.com or email foo@bar.com', + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + 'Visit www.example.com or email foo@bar.com', + ], ]; } @@ -754,22 +910,38 @@ public function testAutoLinkUrl($in, $out) public function autolinkEmails() { return [ - 'test01' => ['www.codeigniter.com test', - 'www.codeigniter.com test'], - 'test02' => ['This is my noreply@codeigniter.com test', - "This is my test"], - 'test03' => ['
www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - "Visit example.com or email "], - 'test08' => ['Visit www.example.com or email foo@bar.com', - "Visit www.example.com or email "], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + "This is my test", + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + "Visit example.com or email ", + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + "Visit www.example.com or email ", + ], ]; } @@ -784,22 +956,38 @@ public function testAutoLinkEmail($in, $out) public function autolinkBoth() { return [ - 'test01' => ['www.codeigniter.com test', - 'www.codeigniter.com test'], - 'test02' => ['This is my noreply@codeigniter.com test', - "This is my test"], - 'test03' => ['
www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - "Visit example.com or email "], - 'test08' => ['Visit www.example.com or email foo@bar.com', - "Visit www.example.com or email "], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + "This is my test", + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + "Visit example.com or email ", + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + "Visit www.example.com or email ", + ], ]; } @@ -814,22 +1002,38 @@ public function testAutolinkBoth($in, $out) public function autolinkPopup() { return [ - 'test01' => ['www.codeigniter.com test', - 'www.codeigniter.com test'], - 'test02' => ['This is my noreply@codeigniter.com test', - 'This is my noreply@codeigniter.com test'], - 'test03' => ['
www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - 'Visit example.com or email foo@bar.com'], - 'test08' => ['Visit www.example.com or email foo@bar.com', - 'Visit www.example.com or email foo@bar.com'], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + 'This is my noreply@codeigniter.com test', + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + 'Visit example.com or email foo@bar.com', + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + 'Visit www.example.com or email foo@bar.com', + ], ]; } @@ -858,21 +1062,21 @@ public function testPrepUrl() public function testUrlTitle() { $words = [ - 'foo bar /' => 'foo-bar', - '\ testing 12' => 'testing-12' + 'foo bar /' => 'foo-bar', + '\ testing 12' => 'testing-12', ]; foreach ($words as $in => $out) { - $this->assertEquals($out, url_title($in, '-', TRUE)); + $this->assertEquals($out, url_title($in, '-', true)); } } public function testUrlTitleExtraDashes() { $words = [ - '_foo bar_' => 'foo_bar', - '_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS' + '_foo bar_' => 'foo_bar', + '_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS', ]; foreach ($words as $in => $out) diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index 04e63f7101a0..1ad4ea6bddb3 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -20,22 +20,22 @@ class HoneypotTest extends CIUnitTestCase protected $request; protected $response; -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function setUp() { parent::setUp(); - $this->config = new \Config\Honeypot(); + $this->config = new \Config\Honeypot(); $this->honeypot = new Honeypot($this->config); unset($_POST[$this->config->name]); - $_SERVER['REQUEST_METHOD'] = 'POST'; + $_SERVER['REQUEST_METHOD'] = 'POST'; $_POST[$this->config->name] = 'hey'; - $this->request = Services::request(null,false); - $this->response = Services::response(); + $this->request = Services::request(null, false); + $this->response = Services::response(); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testAttachHoneypot() { @@ -48,7 +48,7 @@ public function testAttachHoneypot() $this->assertNotContains($this->config->name, $this->response->getBody()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testHasntContent() { @@ -63,7 +63,7 @@ public function testHasContent() $this->assertEquals(true, $this->honeypot->hasContent($this->request)); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testConfigHidden() { @@ -86,19 +86,19 @@ public function testConfigName() $this->honeypot = new Honeypot($this->config); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testHoneypotFilterBefore() { $config = [ - 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], - 'globals' => [ + 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], + 'globals' => [ 'before' => ['trap'], - 'after' => [] - ] + 'after' => [], + ], ]; $filters = new Filters((object) $config, $this->request, $this->response); - $uri = 'admin/foo/bar'; + $uri = 'admin/foo/bar'; $this->expectException(HoneypotException::class); $request = $filters->run($uri, 'before'); @@ -107,15 +107,15 @@ public function testHoneypotFilterBefore() public function testHoneypotFilterAfter() { $config = [ - 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], - 'globals' => [ + 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], + 'globals' => [ 'before' => [], - 'after' => ['trap'] - ] + 'after' => ['trap'], + ], ]; $filters = new Filters((object) $config, $this->request, $this->response); - $uri = 'admin/foo/bar'; + $uri = 'admin/foo/bar'; $this->response->setBody(''); $this->response = $filters->run($uri, 'after'); diff --git a/tests/system/Honeypot/fixtures/HoneyTrap.php b/tests/system/Honeypot/fixtures/HoneyTrap.php index 9ac8b2036bf9..8cc3aceef95e 100644 --- a/tests/system/Honeypot/fixtures/HoneyTrap.php +++ b/tests/system/Honeypot/fixtures/HoneyTrap.php @@ -30,8 +30,8 @@ public function before(RequestInterface $request) /** * Attach a honypot to the current response. * - * @param CodeIgniter\HTTP\RequestInterface $request - * @param CodeIgniter\HTTP\ResponseInterface $response + * @param CodeIgniter\HTTP\RequestInterface $request + * @param CodeIgniter\HTTP\ResponseInterface $response * @return mixed */ public function after(RequestInterface $request, ResponseInterface $response) diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php index d66aff1d018c..880fb5ec8c99 100644 --- a/tests/system/I18n/TimeDifferenceTest.php +++ b/tests/system/I18n/TimeDifferenceTest.php @@ -48,7 +48,7 @@ public function testHumanizeYearsSingle() public function testHumanizeYearsPlural() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 9, 2014 12:00:00', 'America/Chicago'); + $diff = $current->difference('March 9, 2014 12:00:00', 'America/Chicago'); $this->assertEquals('3 years ago', $diff->humanize('en')); } @@ -56,7 +56,7 @@ public function testHumanizeYearsPlural() public function testHumanizeYearsForward() { $current = Time::parse('January 1, 2017', 'America/Chicago'); - $diff = $current->difference('January 1, 2018 12:00:00', 'America/Chicago'); + $diff = $current->difference('January 1, 2018 12:00:00', 'America/Chicago'); $this->assertEquals('in 1 year', $diff->humanize('en')); } @@ -64,7 +64,7 @@ public function testHumanizeYearsForward() public function testHumanizeMonthsSingle() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('February 9, 2017', 'America/Chicago'); + $diff = $current->difference('February 9, 2017', 'America/Chicago'); $this->assertEquals('1 month ago', $diff->humanize('en')); } @@ -72,7 +72,7 @@ public function testHumanizeMonthsSingle() public function testHumanizeMonthsPlural() { $current = Time::parse('March 1, 2017', 'America/Chicago'); - $diff = $current->difference('January 1, 2017', 'America/Chicago'); + $diff = $current->difference('January 1, 2017', 'America/Chicago'); $this->assertEquals('2 months ago', $diff->humanize('en')); } @@ -80,7 +80,7 @@ public function testHumanizeMonthsPlural() public function testHumanizeMonthsForward() { $current = Time::parse('March 1, 2017', 'America/Chicago'); - $diff = $current->difference('May 1, 2017', 'America/Chicago'); + $diff = $current->difference('May 1, 2017', 'America/Chicago'); $this->assertEquals('in 1 month', $diff->humanize('en')); } @@ -88,7 +88,7 @@ public function testHumanizeMonthsForward() public function testHumanizeDaysSingle() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 9, 2017', 'America/Chicago'); + $diff = $current->difference('March 9, 2017', 'America/Chicago'); $this->assertEquals('1 day ago', $diff->humanize('en')); } @@ -96,7 +96,7 @@ public function testHumanizeDaysSingle() public function testHumanizeDaysPlural() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 8, 2017', 'America/Chicago'); + $diff = $current->difference('March 8, 2017', 'America/Chicago'); $this->assertEquals('2 days ago', $diff->humanize('en')); } @@ -104,7 +104,7 @@ public function testHumanizeDaysPlural() public function testHumanizeDaysForward() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 11, 2017', 'America/Chicago'); + $diff = $current->difference('March 11, 2017', 'America/Chicago'); $this->assertEquals('in 1 day', $diff->humanize('en')); } @@ -112,7 +112,7 @@ public function testHumanizeDaysForward() public function testHumanizeHoursSingle() { $current = Time::parse('March 10, 2017 12:00', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 11:00', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 11:00', 'America/Chicago'); $this->assertEquals('1 hour ago', $diff->humanize('en')); } @@ -120,7 +120,7 @@ public function testHumanizeHoursSingle() public function testHumanizeHoursPlural() { $current = Time::parse('March 10, 2017 12:00', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 10:00', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 10:00', 'America/Chicago'); $this->assertEquals('2 hours ago', $diff->humanize('en')); } @@ -128,7 +128,7 @@ public function testHumanizeHoursPlural() public function testHumanizeHoursForward() { $current = Time::parse('March 10, 2017 12:00', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 13:00', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 13:00', 'America/Chicago'); $this->assertEquals('in 1 hour', $diff->humanize('en')); } @@ -136,7 +136,7 @@ public function testHumanizeHoursForward() public function testHumanizeMinutesSingle() { $current = Time::parse('March 10, 2017 12:30', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 12:29', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 12:29', 'America/Chicago'); $this->assertEquals('1 minute ago', $diff->humanize('en')); } @@ -144,7 +144,7 @@ public function testHumanizeMinutesSingle() public function testHumanizeMinutesPlural() { $current = Time::parse('March 10, 2017 12:30', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 12:28', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 12:28', 'America/Chicago'); $this->assertEquals('2 minutes ago', $diff->humanize('en')); } @@ -152,7 +152,7 @@ public function testHumanizeMinutesPlural() public function testHumanizeMinutesForward() { $current = Time::parse('March 10, 2017 12:30', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 12:31', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 12:31', 'America/Chicago'); $this->assertEquals('in 1 minute', $diff->humanize('en')); } @@ -160,7 +160,7 @@ public function testHumanizeMinutesForward() public function testHumanizeWeeksSingle() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 2, 2017', 'America/Chicago'); + $diff = $current->difference('March 2, 2017', 'America/Chicago'); $this->assertEquals('1 week ago', $diff->humanize('en')); } @@ -168,7 +168,7 @@ public function testHumanizeWeeksSingle() public function testHumanizeWeeksPlural() { $current = Time::parse('March 30, 2017', 'America/Chicago'); - $diff = $current->difference('March 15, 2017', 'America/Chicago'); + $diff = $current->difference('March 15, 2017', 'America/Chicago'); $this->assertEquals('2 weeks ago', $diff->humanize('en')); } @@ -176,7 +176,7 @@ public function testHumanizeWeeksPlural() public function testHumanizeWeeksForward() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 18, 2017', 'America/Chicago'); + $diff = $current->difference('March 18, 2017', 'America/Chicago'); $this->assertEquals('in 1 week', $diff->humanize('en')); } diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php index 93d709943d52..b159eb436840 100644 --- a/tests/system/I18n/TimeTest.php +++ b/tests/system/I18n/TimeTest.php @@ -87,7 +87,7 @@ public function testToDateTime() public function testNow() { - $time = Time::now(); + $time = Time::now(); $time1 = new \DateTime(); $this->assertInstanceOf(Time::class, $time); @@ -96,7 +96,7 @@ public function testNow() public function testParse() { - $time = Time::parse('next Tuesday', 'America/Chicago'); + $time = Time::parse('next Tuesday', 'America/Chicago'); $time1 = new \DateTime('now', new \DateTimeZone('America/Chicago')); $time1->modify('next Tuesday'); @@ -306,7 +306,7 @@ public function testGetWeekOfYear() public function testGetTimestamp() { - $time = Time::parse('August 12, 2016 4:15:23pm'); + $time = Time::parse('August 12, 2016 4:15:23pm'); $expected = strtotime('August 12, 2016 4:15:23pm'); $this->assertEquals($expected, $time->timestamp); @@ -359,7 +359,7 @@ public function testGetTimezonename() public function testSetYear() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setYear(2015); $this->assertInstanceOf(Time::class, $time2); @@ -369,7 +369,7 @@ public function testSetYear() public function testSetMonthNumber() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMonth(4); $this->assertInstanceOf(Time::class, $time2); @@ -379,7 +379,7 @@ public function testSetMonthNumber() public function testSetMonthLongName() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMonth('April'); $this->assertInstanceOf(Time::class, $time2); @@ -389,7 +389,7 @@ public function testSetMonthLongName() public function testSetMonthShortName() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMonth('Feb'); $this->assertInstanceOf(Time::class, $time2); @@ -399,36 +399,36 @@ public function testSetMonthShortName() public function testSetDay() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setDay(15); $this->assertInstanceOf(Time::class, $time2); $this->assertNotSame($time, $time2); $this->assertEquals('2017-05-15 00:00:00', $time2->toDateTimeString()); - } + } - /** - * @expectedException \CodeIgniter\I18n\Exceptions\I18nException - */ - public function testSetDayOverMaxInCurrentMonth() - { + /** + * @expectedException \CodeIgniter\I18n\Exceptions\I18nException + */ + public function testSetDayOverMaxInCurrentMonth() + { $time = Time::parse('Feb 02, 2009'); - $time->setDay(29); - } + $time->setDay(29); + } - public function testSetDayNotOverMaxInCurrentMonth() - { - $time = Time::parse('Feb 02, 2012'); - $time2 = $time->setDay(29); + public function testSetDayNotOverMaxInCurrentMonth() + { + $time = Time::parse('Feb 02, 2012'); + $time2 = $time->setDay(29); - $this->assertInstanceOf(Time::class, $time2); + $this->assertInstanceOf(Time::class, $time2); $this->assertNotSame($time, $time2); $this->assertEquals('2012-02-29 00:00:00', $time2->toDateTimeString()); } public function testSetHour() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setHour(15); $this->assertInstanceOf(Time::class, $time2); @@ -438,7 +438,7 @@ public function testSetHour() public function testSetMinute() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMinute(30); $this->assertInstanceOf(Time::class, $time2); @@ -448,7 +448,7 @@ public function testSetMinute() public function testSetSecond() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setSecond(20); $this->assertInstanceOf(Time::class, $time2); @@ -548,7 +548,7 @@ public function testSetSecondTooBig() public function testSetTimezone() { - $time = Time::parse('May 10, 2017', 'America/Chicago'); + $time = Time::parse('May 10, 2017', 'America/Chicago'); $time2 = $time->setTimezone('Europe/London'); $this->assertInstanceOf(Time::class, $time2); @@ -559,7 +559,7 @@ public function testSetTimezone() public function testSetTimestamp() { - $time = Time::parse('May 10, 2017', 'America/Chicago'); + $time = Time::parse('May 10, 2017', 'America/Chicago'); $stamp = strtotime('April 1, 2017'); $time2 = $time->setTimestamp($stamp); @@ -579,11 +579,11 @@ public function testToDateString() * shows a numeric version of the month instead of the textual version. * Not sure what the fix is just yet.... */ -// public function testToFormattedDateString() -// { -// $time = Time::parse('February 10, 2017', 'America/Chicago'); -// $this->assertEquals('Feb 10, 2017', $time->toFormattedDateString()); -// } + // public function testToFormattedDateString() + // { + // $time = Time::parse('February 10, 2017', 'America/Chicago'); + // $this->assertEquals('Feb 10, 2017', $time->toFormattedDateString()); + // } public function testToTimeString() { @@ -597,7 +597,7 @@ public function testToTimeString() public function testCanAddSeconds() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addSeconds(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:20:43', $newTime->toDateTimeString()); @@ -605,7 +605,7 @@ public function testCanAddSeconds() public function testCanAddMinutes() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addMinutes(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:30:33', $newTime->toDateTimeString()); @@ -613,7 +613,7 @@ public function testCanAddMinutes() public function testCanAddHours() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addHours(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 16:20:33', $newTime->toDateTimeString()); @@ -621,7 +621,7 @@ public function testCanAddHours() public function testCanAddDays() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addDays(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-13 13:20:33', $newTime->toDateTimeString()); @@ -629,7 +629,7 @@ public function testCanAddDays() public function testCanAddMonths() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addMonths(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-04-10 13:20:33', $newTime->toDateTimeString()); @@ -637,7 +637,7 @@ public function testCanAddMonths() public function testCanAddMonthsOverYearBoundary() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addMonths(13); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2018-02-10 13:20:33', $newTime->toDateTimeString()); @@ -645,7 +645,7 @@ public function testCanAddMonthsOverYearBoundary() public function testCanAddYears() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addYears(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2020-01-10 13:20:33', $newTime->toDateTimeString()); @@ -653,7 +653,7 @@ public function testCanAddYears() public function testCanSubtractSeconds() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subSeconds(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:20:23', $newTime->toDateTimeString()); @@ -661,7 +661,7 @@ public function testCanSubtractSeconds() public function testCanSubtractMinutes() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subMinutes(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:10:33', $newTime->toDateTimeString()); @@ -669,7 +669,7 @@ public function testCanSubtractMinutes() public function testCanSubtractHours() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subHours(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 10:20:33', $newTime->toDateTimeString()); @@ -677,7 +677,7 @@ public function testCanSubtractHours() public function testCanSubtractDays() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subDays(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-07 13:20:33', $newTime->toDateTimeString()); @@ -685,7 +685,7 @@ public function testCanSubtractDays() public function testCanSubtractMonths() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subMonths(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2016-10-10 13:20:33', $newTime->toDateTimeString()); @@ -693,7 +693,7 @@ public function testCanSubtractMonths() public function testCanSubtractYears() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subYears(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2014-01-10 13:20:33', $newTime->toDateTimeString()); @@ -941,5 +941,4 @@ public function testHumanizeWeeksForward() $this->assertEquals('in 2 weeks', $time->humanize()); } - } diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php index 8a209fc7b198..52d79d68f9ac 100644 --- a/tests/system/Images/BaseHandlerTest.php +++ b/tests/system/Images/BaseHandlerTest.php @@ -5,7 +5,7 @@ /** * Test the common image processing functionality. - * + * * Note: some of the underlying PHP functions do not play nicely * with vfsStream, so the support files are used directly for * most work, and the virtual file system will be used for @@ -16,7 +16,7 @@ class BaseHandlerTest extends \CIUnitTestCase public function setUp() { - if ( ! extension_loaded('gd')) + if (! extension_loaded('gd')) { $this->markTestSkipped('The GD extension is not available.'); return; @@ -28,14 +28,17 @@ public function setUp() $this->origin = SUPPORTPATH . 'Images/'; vfsStream::copyFromFileSystem($this->origin, $this->root); // make subfolders - $structure = ['work' => [], 'wontwork' => []]; + $structure = [ + 'work' => [], + 'wontwork' => [], + ]; vfsStream::create($structure); // with one of them read only $wont = $this->root->getChild('wontwork')->chmod(0400); // for VFS tests - $this->start = $this->root->url() . '/'; - $this->path = $this->start . 'ci-logo.png'; + $this->start = $this->root->url() . '/'; + $this->path = $this->start . 'ci-logo.png'; } //-------------------------------------------------------------------- @@ -48,7 +51,7 @@ public function testNew() public function testWithFile() { - $path = $this->origin . 'ci-logo.png'; + $path = $this->origin . 'ci-logo.png'; $handler = Services::image('gd', null, false); $handler->withFile($path); diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php index 1bcac5fcc479..8bc6e1f536a2 100644 --- a/tests/system/Images/GDHandlerTest.php +++ b/tests/system/Images/GDHandlerTest.php @@ -10,7 +10,7 @@ * different transformations, so we have to rely on the underlying package. * We can make sure that we can call it without blowing up, * and we can make sure the code coverage is good. - * + * * Was unable to test fontPath & related logic. */ class GDHandlerTest extends \CIUnitTestCase @@ -18,7 +18,7 @@ class GDHandlerTest extends \CIUnitTestCase public function setUp() { - if ( ! extension_loaded('gd')) + if (! extension_loaded('gd')) { $this->markTestSkipped('The GD extension is not available.'); return; @@ -29,14 +29,17 @@ public function setUp() // copy our support files $this->origin = SUPPORTPATH . 'Images/'; // make subfolders - $structure = ['work' => [], 'wontwork' => []]; + $structure = [ + 'work' => [], + 'wontwork' => [], + ]; vfsStream::create($structure); // with one of them read only $wont = $this->root->getChild('wontwork')->chmod(0400); $this->start = $this->root->url() . '/'; - $this->path = $this->origin . 'ci-logo.png'; + $this->path = $this->origin . 'ci-logo.png'; $this->handler = Services::image('gd', null, false); } @@ -53,7 +56,7 @@ public function testGetVersion() public function testImageProperties() { $this->handler->withFile($this->path); - $file = $this->handler->getFile(); + $file = $this->handler->getFile(); $props = $file->getProperties(true); $this->assertEquals(155, $this->handler->getWidth()); @@ -70,14 +73,14 @@ public function testImageProperties() public function testImageTypeProperties() { $this->handler->withFile($this->path); - $file = $this->handler->getFile(); + $file = $this->handler->getFile(); $props = $file->getProperties(true); $this->assertEquals(IMAGETYPE_PNG, $props['image_type']); $this->assertEquals('image/png', $props['mime_type']); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testResizeIgnored() { @@ -119,7 +122,7 @@ public function testResizeAspectHeight() $this->assertEquals(456, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testCropTopLeft() { @@ -169,7 +172,7 @@ public function testCropOutOfBounds() $this->assertEquals(100, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testRotate() { @@ -193,7 +196,7 @@ public function testRotateBadAngle() $this->handler->rotate(77); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testFlatten() { @@ -203,7 +206,7 @@ public function testFlatten() $this->assertEquals(200, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testFlip() { @@ -236,7 +239,7 @@ public function testFlipUnknown() $this->handler->flip('bogus'); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testFit() { $this->handler->withFile($this->path); @@ -263,7 +266,17 @@ public function testFitAutoHeight() public function testFitPositions() { - $choices = ['top-left', 'top', 'top-right', 'left', 'center', 'right', 'bottom-left', 'bottom', 'bottom-right']; + $choices = [ + 'top-left', + 'top', + 'top-right', + 'left', + 'center', + 'right', + 'bottom-left', + 'bottom', + 'bottom-right', + ]; $this->handler->withFile($this->path); foreach ($choices as $position) { @@ -273,7 +286,7 @@ public function testFitPositions() } } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testText() { @@ -283,7 +296,7 @@ public function testText() $this->assertEquals(200, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testMoreText() { @@ -293,7 +306,7 @@ public function testMoreText() $this->assertEquals(200, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testImageCreation() { @@ -306,7 +319,7 @@ public function testImageCreation() } } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testImageSave() { diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php index 8446f0d5aa79..69257038b21c 100644 --- a/tests/system/Images/ImageTest.php +++ b/tests/system/Images/ImageTest.php @@ -16,7 +16,10 @@ public function setup() $this->origin = '_support/Images/'; vfsStream::copyFromFileSystem(TESTPATH . $this->origin, $this->root); // make subfolders - $structure = ['work' => [], 'wontwork' => []]; + $structure = [ + 'work' => [], + 'wontwork' => [], + ]; vfsStream::create($structure); // with one of them read only $wont = $this->root->getChild('wontwork')->chmod(0400); @@ -37,11 +40,11 @@ public function testBasicPropertiesInherited() public function testGetProperties() { $expected = [ - 'width' => 155, - 'height' => 200, + 'width' => 155, + 'height' => 200, 'image_type' => IMAGETYPE_PNG, - 'size_str' => 'width="155" height="200"', - 'mime_type' => "image/png", + 'size_str' => 'width="155" height="200"', + 'mime_type' => 'image/png', ]; $this->assertEquals($expected, $this->image->getProperties(true)); @@ -56,7 +59,7 @@ public function testExtractProperties() $this->assertEquals(200, $this->image->origHeight); $this->assertEquals(IMAGETYPE_PNG, $this->image->imageType); $this->assertEquals('width="155" height="200"', $this->image->sizeStr); - $this->assertEquals("image/png", $this->image->mime); + $this->assertEquals('image/png', $this->image->mime); } public function testCopyDefaultName() diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php index 152e61bdef40..0041dd0fc3e7 100644 --- a/tests/system/Language/LanguageTest.php +++ b/tests/system/Language/LanguageTest.php @@ -20,8 +20,8 @@ public function testGetLineReturnsLine() $lang = new MockLanguage('en'); $lang->setData([ - 'bookSaved' => 'We kept the book free from the boogeyman', - 'booksSaved' => 'We saved some more' + 'bookSaved' => 'We kept the book free from the boogeyman', + 'booksSaved' => 'We saved some more', ]); $this->assertEquals('We saved some more', $lang->getLine('books.booksSaved')); @@ -36,14 +36,14 @@ public function testGetLineArrayReturnsLineArray() $lang->setData([ 'booksList' => [ 'The Boogeyman', - 'We Saved' - ] + 'We Saved', + ], ]); $this->assertEquals([ 'The Boogeyman', - 'We Saved' - ], $lang->getLine('books.booksList')); + 'We Saved', + ], $lang->getLine('books.booksList')); } //-------------------------------------------------------------------- @@ -51,13 +51,15 @@ public function testGetLineArrayReturnsLineArray() public function testGetLineFormatsMessage() { // No intl extension? then we can't test this - go away.... - if ( ! class_exists('\MessageFormatter')) + if (! class_exists('\MessageFormatter')) + { return; + } $lang = new MockLanguage('en'); $lang->setData([ - 'bookCount' => '{0, number, integer} books have been saved.' + 'bookCount' => '{0, number, integer} books have been saved.', ]); $this->assertEquals('45 books have been saved.', $lang->getLine('books.bookCount', [91 / 2])); @@ -68,7 +70,7 @@ public function testGetLineFormatsMessage() public function testGetLineArrayFormatsMessages() { // No intl extension? Then we can't test this - go away... - if ( ! class_exists('\MessageFormatter')) + if (! class_exists('\MessageFormatter')) { return; } @@ -78,7 +80,7 @@ public function testGetLineArrayFormatsMessages() $lang->setData([ 'bookList' => [ '{0, number, integer} related books.' - ] + ], ]); $this->assertEquals(['45 related books.'], $lang->getLine('books.bookList', [91 / 2])); @@ -108,7 +110,7 @@ public function testLangDoesntFormat() $lang->setData([ 'bookList' => [ '{0, number, integer} related books.' - ] + ], ]); $this->assertEquals(['{0, number, integer} related books.'], $lang->getLine('books.bookList', [15])); diff --git a/tests/system/Log/ChromeLoggerHandlerTest.php b/tests/system/Log/ChromeLoggerHandlerTest.php index e48e286ec32f..14253e960ef8 100644 --- a/tests/system/Log/ChromeLoggerHandlerTest.php +++ b/tests/system/Log/ChromeLoggerHandlerTest.php @@ -9,7 +9,7 @@ class ChromeLoggerHandlerTest extends \CIUnitTestCase public function testCanHandleLogLevel() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); @@ -20,18 +20,18 @@ public function testCanHandleLogLevel() public function testHandle() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); - $this->assertTrue($logger->handle("warning", "This a log test")); + $this->assertTrue($logger->handle('warning', 'This a log test')); } //-------------------------------------------------------------------- public function testSendLogs() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); @@ -46,7 +46,7 @@ public function testSendLogs() public function testSetDateFormat() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); @@ -60,14 +60,14 @@ public function testSetDateFormat() public function testObjectMessage() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; - $logger = new MockChromeHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); - $data = new \stdClass(); - $data->code = 123; + $logger = new MockChromeHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); + $data = new \stdClass(); + $data->code = 123; $data->explanation = "That's no moon, it's a pumpkin"; - $result = $logger->setDateFormat('F j, Y'); + $result = $logger->setDateFormat('F j, Y'); $logger->handle('debug', $data); $peek = $logger->peekaboo(); diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php index fb54ac548aef..e6b5e1d09375 100644 --- a/tests/system/Log/LoggerTest.php +++ b/tests/system/Log/LoggerTest.php @@ -11,7 +11,7 @@ class LoggerTest extends \CIUnitTestCase public function testThrowsExceptionWithBadHandlerSettings() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers = null; $this->expectException(FrameworkException::class); @@ -38,7 +38,7 @@ public function testLogThrowsExceptionOnInvalidLevel() public function testLogReturnsFalseWhenLogNotHandled() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->threshold = 3; $logger = new Logger($config); @@ -51,7 +51,7 @@ public function testLogReturnsFalseWhenLogNotHandled() public function testLogActuallyLogs() { $config = new LoggerConfig(); -// $Config->handlers['TestHandler']['handles'] = [LogLevel::CRITICAL]; + // $Config->handlers['TestHandler']['handles'] = [LogLevel::CRITICAL]; $logger = new Logger($config); @@ -69,7 +69,7 @@ public function testLogActuallyLogs() public function testLogDoesnotLogUnhandledLevels() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new Logger($config); @@ -107,7 +107,7 @@ public function testLogInterpolatesPost() $logger = new Logger($config); - $_POST = ['foo' => 'bar']; + $_POST = ['foo' => 'bar']; $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_POST: ' . print_r($_POST, true); $logger->log('debug', 'Test message {post_vars}'); @@ -126,7 +126,7 @@ public function testLogInterpolatesGet() $logger = new Logger($config); - $_GET = ['bar' => 'baz']; + $_GET = ['bar' => 'baz']; $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_GET: ' . print_r($_GET, true); $logger->log('debug', 'Test message {get_vars}'); @@ -228,7 +228,8 @@ public function testLogInterpolatesExceptions() try { throw new Exception('These are not the droids you are looking for'); - } catch (\Exception $e) + } + catch (\Exception $e) { $logger->log('error', '[ERROR] {exception}', ['exception' => $e]); } @@ -415,7 +416,7 @@ public function testFilenameCleaning() $config = new LoggerConfig(); $logger = new \Tests\Support\Log\TestLogger($config); - $ohoh = APPPATH . 'LoggerTest'; + $ohoh = APPPATH . 'LoggerTest'; $expected = 'APPPATH/LoggerTest'; $this->assertEquals($expected, $logger->cleanup($ohoh)); diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php index e410c9b2ea77..368c18b7a001 100644 --- a/tests/system/Pager/PagerRendererTest.php +++ b/tests/system/Pager/PagerRendererTest.php @@ -13,7 +13,7 @@ public function setUp() { parent::setUp(); - $this->uri = new URI('http://example.com/foo'); + $this->uri = new URI('http://example.com/foo'); $this->expect = 'http://example.com/foo?page='; } @@ -22,10 +22,10 @@ public function setUp() public function testHasPreviousReturnsFalseWhenFirstIsOne() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 5, - 'currentPage' => 1, - 'total' => 100 + 'uri' => $this->uri, + 'pageCount' => 5, + 'currentPage' => 1, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -41,10 +41,10 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOne() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 10, - 'currentPage' => 5, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 10, + 'currentPage' => 5, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -62,10 +62,10 @@ public function testGetPreviousWhenSurroundCountIsZero() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -83,10 +83,10 @@ public function testHasNextReturnsFalseWhenLastIsTotal() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 5, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 5, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -103,10 +103,10 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotal() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -124,10 +124,10 @@ public function testGetNextWhenSurroundCountIsZero() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -142,10 +142,10 @@ public function testGetNextWhenSurroundCountIsZero() public function testLinksBasics() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $this->uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -153,19 +153,19 @@ public function testLinksBasics() $expected = [ [ - 'uri' => 'http://example.com/foo?page=3', - 'title' => 3, - 'active' => false + 'uri' => 'http://example.com/foo?page=3', + 'title' => 3, + 'active' => false, ], [ - 'uri' => 'http://example.com/foo?page=4', - 'title' => 4, - 'active' => true + 'uri' => 'http://example.com/foo?page=4', + 'title' => 4, + 'active' => true, ], [ - 'uri' => 'http://example.com/foo?page=5', - 'title' => 5, - 'active' => false + 'uri' => 'http://example.com/foo?page=5', + 'title' => 5, + 'active' => false, ], ]; @@ -180,10 +180,10 @@ public function testGetFirstAndGetLast() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -199,10 +199,10 @@ public function testSurroundCount() $uri = $this->uri; $details = [ - 'uri' => $uri, - 'pageCount' => 10, // 10 pages - 'currentPage' => 4, - 'total' => 100 // 100 records, so 10 per page + 'uri' => $uri, + 'pageCount' => 10, // 10 pages + 'currentPage' => 4, + 'total' => 100,// 100 records, so 10 per page ]; $pager = new PagerRenderer($details); @@ -227,19 +227,16 @@ public function testSurroundCount() $this->assertEquals(null, $pager->getNext()); } - - - //-------------------------------------------------------------------- public function testHasPreviousReturnsFalseWhenFirstIsOneSegment() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 5, - 'currentPage' => 1, - 'total' => 100, - 'segment' => 2, + 'uri' => $this->uri, + 'pageCount' => 5, + 'currentPage' => 1, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -255,11 +252,11 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOneSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 10, - 'currentPage' => 5, - 'total' => 100, - 'segment' => 2 + 'uri' => $uri, + 'pageCount' => 10, + 'currentPage' => 5, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -277,11 +274,11 @@ public function testGetPreviousWhenSurroundCountIsZeroSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2, + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -299,11 +296,11 @@ public function testHasNextReturnsFalseWhenLastIsTotalSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 5, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2, + 'uri' => $uri, + 'pageCount' => 5, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -320,11 +317,11 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotalSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -342,11 +339,11 @@ public function testGetNextWhenSurroundCountIsZeroSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2, + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -361,11 +358,11 @@ public function testGetNextWhenSurroundCountIsZeroSegment() public function testLinksBasicsSegment() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2 + 'uri' => $this->uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -373,19 +370,19 @@ public function testLinksBasicsSegment() $expected = [ [ - 'uri' => 'http://example.com/foo/3', - 'title' => 3, - 'active' => false + 'uri' => 'http://example.com/foo/3', + 'title' => 3, + 'active' => false, ], [ - 'uri' => 'http://example.com/foo/4', - 'title' => 4, - 'active' => true + 'uri' => 'http://example.com/foo/4', + 'title' => 4, + 'active' => true, ], [ - 'uri' => 'http://example.com/foo/5', - 'title' => 5, - 'active' => false + 'uri' => 'http://example.com/foo/5', + 'title' => 5, + 'active' => false, ], ]; @@ -400,11 +397,11 @@ public function testGetFirstAndGetLastSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -413,6 +410,4 @@ public function testGetFirstAndGetLastSegment() $this->assertEquals('http://example.com/foo/50?foo=bar', $pager->getLast()); } - - } diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php index 4c9a505fbd5d..37f43103fb6e 100644 --- a/tests/system/Pager/PagerTest.php +++ b/tests/system/Pager/PagerTest.php @@ -216,7 +216,7 @@ public function testGetNextURIWithQueryStringUsesCurrentURI() $expected = current_url(true); $expected = (string)$expected->setQueryArray($_GET); - $this->pager->store('foo', $_GET['page']-1, 12, 70); + $this->pager->store('foo', $_GET['page'] - 1, 12, 70); $this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo')); } @@ -230,7 +230,7 @@ public function testGetPreviousURIWithQueryStringUsesCurrentURI() $expected = current_url(true); $expected = (string)$expected->setQueryArray($_GET); - $this->pager->store('foo', $_GET['page']+1, 12, 70); + $this->pager->store('foo', $_GET['page'] + 1, 12, 70); $this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo')); } @@ -244,7 +244,10 @@ public function testGetOnlyQueries() 'hello' => 'xxx', 'category' => 'baz', ]; - $onlyQueries = ['search', 'order']; + $onlyQueries = [ + 'search', + 'order', + ]; $this->pager->store('default', $_GET['page'], 10, 100); @@ -252,15 +255,15 @@ public function testGetOnlyQueries() $this->assertEquals( $this->pager->only($onlyQueries) - ->getPreviousPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=1') + ->getPreviousPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=1') ); $this->assertEquals( $this->pager->only($onlyQueries) - ->getNextPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=3') + ->getNextPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=3') ); $this->assertEquals( $this->pager->only($onlyQueries) - ->getPageURI(4), (string)$uri->setQuery('search=foo&order=asc&page=4') + ->getPageURI(4), (string)$uri->setQuery('search=foo&order=asc&page=4') ); } @@ -270,7 +273,6 @@ public function testBadTemplate() $this->pager->links('default', 'bogus'); } - // the tests below are looking for specific
Response ( )
+Response ( )
@@ -272,9 +272,9 @@ diff --git a/system/Debug/Toolbar/toolbarloader.js.php b/system/Debug/Toolbar/toolbarloader.js.php index d1e09df0eb11..cb60f102a04f 100644 --- a/system/Debug/Toolbar/toolbarloader.js.php +++ b/system/Debug/Toolbar/toolbarloader.js.php @@ -1,4 +1,4 @@ - + document.addEventListener('DOMContentLoaded', loadDoc, false); function loadDoc(time) { diff --git a/system/Entity.php b/system/Entity.php index 6a313c6d0453..58bab62da351 100644 --- a/system/Entity.php +++ b/system/Entity.php @@ -29,12 +29,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ class Entity @@ -55,13 +55,17 @@ class Entity /* * Define properties that are automatically converted to Time instances. */ - 'dates' => ['created_at', 'updated_at', 'deleted_at'], + 'dates' => [ + 'created_at', + 'updated_at', + 'deleted_at', + ], /* * Array of field names and the type of value to cast them as * when they are accessed. */ - 'casts' => [] + 'casts' => [], ]; /** @@ -74,12 +78,12 @@ class Entity protected $_original = []; /** - * Holds info whenever prperties have to be casted - * - * @var boolean - **/ + * Holds info whenever prperties have to be casted + * + * @var boolean + **/ private $_cast = true; - + /** * Allows filling in Entity parameters during construction. * @@ -93,7 +97,7 @@ public function __construct(array $data = null) foreach ($properties as $key => $value) { - if (substr($key, 0, 1) == '_') + if (substr($key, 0, 1) === '_') { unset($properties[$key]); } @@ -139,15 +143,15 @@ public function fill(array $data) * through the __get() magic method so will have any casts, etc * applied to them. * - * @param bool $onlyChanged If true, only return values that have changed since object creation - * @param bool $cast If true, properties will be casted. + * @param boolean $onlyChanged If true, only return values that have changed since object creation + * @param boolean $cast If true, properties will be casted. * * @return array */ public function toArray(bool $onlyChanged = false, bool $cast = true): array { $this->_cast = $cast; - $return = []; + $return = []; // we need to loop over our properties so that we // allow our magic methods a chance to do their thing. @@ -155,7 +159,10 @@ public function toArray(bool $onlyChanged = false, bool $cast = true): array foreach ($properties as $key => $value) { - if (substr($key, 0, 1) == '_') continue; + if (substr($key, 0, 1) === '_') + { + continue; + } if ($onlyChanged && $this->_original[$key] === null && $value === null) { @@ -304,14 +311,16 @@ public function __unset(string $key) { // If not actual property exists, get out // before we confuse our data mapping. - if ( ! property_exists($this, $key)) + if (! property_exists($this, $key)) + { return; + } $this->$key = null; // Get the class' original default value for this property // so we can reset it to the original value. - $reflectionClass = new \ReflectionClass($this); + $reflectionClass = new \ReflectionClass($this); $defaultProperties = $reflectionClass->getDefaultProperties(); if (isset($defaultProperties[$key])) @@ -328,7 +337,7 @@ public function __unset(string $key) * * @param string $key * - * @return bool + * @return boolean */ public function __isset(string $key): bool { @@ -404,7 +413,7 @@ protected function mutateDate($value) /** * Provides the ability to cast an item as a specific data type. * - * @param $value + * @param $value * @param string $type * * @return mixed @@ -433,7 +442,7 @@ protected function castAs($value, string $type) $value = (object)$value; break; case 'array': - if (is_string($value) && (strpos($value,'a:') === 0 || strpos($value, 's:') === 0)) + if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)) { $value = unserialize($value); } @@ -462,21 +471,21 @@ protected function castAs($value, string $type) /** * Cast as JSON * - * @param mixed $value - * @param bool $asArray + * @param mixed $value + * @param boolean $asArray * * @return mixed */ private function castAsJson($value, bool $asArray = false) { - $tmp = !is_null($value) ? ($asArray ? [] : new \stdClass) : null; - if(function_exists('json_decode')) + $tmp = ! is_null($value) ? ($asArray ? [] : new \stdClass) : null; + if (function_exists('json_decode')) { - if((is_string($value) && (strpos($value, '[') === 0 || strpos($value, '{') === 0 || (strpos($value, '"') === 0 && strrpos($value, '"') === 0 ))) || is_numeric($value)) + if ((is_string($value) && (strpos($value, '[') === 0 || strpos($value, '{') === 0 || (strpos($value, '"') === 0 && strrpos($value, '"') === 0 ))) || is_numeric($value)) { $tmp = json_decode($value, $asArray); - if(json_last_error() !== JSON_ERROR_NONE) + if (json_last_error() !== JSON_ERROR_NONE) { throw CastException::forInvalidJsonFormatException(json_last_error()); } diff --git a/system/Events/Events.php b/system/Events/Events.php index bb53298600ad..2ec7db0f2a69 100644 --- a/system/Events/Events.php +++ b/system/Events/Events.php @@ -29,12 +29,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ define('EVENT_PRIORITY_LOW', 200); @@ -58,7 +58,7 @@ class Events * Flag to let us know if we've read from the Config file(s) * and have all of the defined events. * - * @var bool + * @var boolean */ protected static $initialized = false; @@ -66,19 +66,21 @@ class Events * If true, events will not actually be fired. * Useful during testing. * - * @var bool + * @var boolean */ protected static $simulate = false; /** * Stores information about the events * for display in the debug toolbar. + * * @var array */ protected static $performanceLog = []; /** * A list of found files. + * * @var array */ protected static $files = []; @@ -98,12 +100,12 @@ public static function initialize() $config = config('Modules'); - $files = [APPPATH.'Config/Events.php']; + $files = [APPPATH . 'Config/Events.php']; if ($config->shouldDiscover('events')) { $locator = Services::locator(); - $files = $locator->search('Config/Events.php'); + $files = $locator->search('Config/Events.php'); } static::$files = $files; @@ -132,23 +134,23 @@ public static function initialize() * Events::on('create', [$myInstance, 'myMethod']); // Method on an existing instance * Events::on('create', function() {}); // Closure * - * @param $event_name - * @param callable $callback - * @param int $priority + * @param $event_name + * @param callable $callback + * @param integer $priority */ public static function on($event_name, callable $callback, $priority = EVENT_PRIORITY_NORMAL) { - if ( ! isset(self::$listeners[$event_name])) + if (! isset(self::$listeners[$event_name])) { self::$listeners[$event_name] = [ - true, // If there's only 1 item, it's sorted. - [$priority], - [$callback], - ]; + true, // If there's only 1 item, it's sorted. + [$priority], + [$callback], + ]; } else { - self::$listeners[$event_name][0] = false; // Not sorted + self::$listeners[$event_name][0] = false; // Not sorted self::$listeners[$event_name][1][] = $priority; self::$listeners[$event_name][2][] = $callback; } @@ -165,12 +167,12 @@ public static function on($event_name, callable $callback, $priority = EVENT_PRI * @param $eventName * @param $arguments * - * @return bool + * @return boolean */ public static function trigger($eventName, ...$arguments): bool { // Read in our Config/events file so that we have them all! - if ( ! self::$initialized) + if (! self::$initialized) { self::initialize(); } @@ -189,8 +191,8 @@ public static function trigger($eventName, ...$arguments): bool { static::$performanceLog[] = [ 'start' => $start, - 'end' => microtime(true), - 'event' => strtolower($eventName) + 'end' => microtime(true), + 'event' => strtolower($eventName), ]; } @@ -218,13 +220,13 @@ public static function trigger($eventName, ...$arguments): bool */ public static function listeners($event_name): array { - if ( ! isset(self::$listeners[$event_name])) + if (! isset(self::$listeners[$event_name])) { return []; } // The list is not sorted - if ( ! self::$listeners[$event_name][0]) + if (! self::$listeners[$event_name][0]) { // Sort it! array_multisort(self::$listeners[$event_name][1], SORT_NUMERIC, self::$listeners[$event_name][2]); @@ -244,14 +246,14 @@ public static function listeners($event_name): array * If the listener couldn't be found, returns FALSE, else TRUE if * it was removed. * - * @param $event_name - * @param callable $listener + * @param $event_name + * @param callable $listener * - * @return bool + * @return boolean */ public static function removeListener($event_name, callable $listener): bool { - if ( ! isset(self::$listeners[$event_name])) + if (! isset(self::$listeners[$event_name])) { return false; } @@ -282,7 +284,7 @@ public static function removeListener($event_name, callable $listener): bool */ public static function removeAllListeners($event_name = null) { - if ( ! is_null($event_name)) + if (! is_null($event_name)) { unset(self::$listeners[$event_name]); } @@ -323,7 +325,7 @@ public function getFiles() * simply logged. Useful during testing when you don't actually want * the tests to run. * - * @param bool $choice + * @param boolean $choice */ public static function simulate(bool $choice = true) { diff --git a/system/Exceptions/AlertError.php b/system/Exceptions/AlertError.php index d229358bf90b..8dff43c53ed4 100644 --- a/system/Exceptions/AlertError.php +++ b/system/Exceptions/AlertError.php @@ -3,6 +3,7 @@ /** * Error: Action must be taken immediately (system/db down, etc) */ + class AlertError extends \Error { diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php index b4cbbbbd55ec..a5bb06594e2e 100644 --- a/system/Exceptions/CastException.php +++ b/system/Exceptions/CastException.php @@ -3,38 +3,39 @@ /** * Cast Exceptions. */ + class CastException extends CriticalError { /** * Error code - * @var int + * + * @var integer */ protected $code = 3; public static function forInvalidJsonFormatException(int $error) - { + { switch($error) { case JSON_ERROR_DEPTH: throw new static(lang('Cast.jsonErrorDepth')); - break; + break; case JSON_ERROR_STATE_MISMATCH: throw new static(lang('Cast.jsonErrorStateMismatch')); - break; + break; case JSON_ERROR_CTRL_CHAR: throw new static(lang('Cast.jsonErrorCtrlChar')); - break; + break; case JSON_ERROR_SYNTAX: throw new static(lang('Cast.jsonErrorSyntax')); - break; + break; case JSON_ERROR_UTF8: throw new static(lang('Cast.jsonErrorUtf8')); - break; + break; default: throw new static(lang('Cast.jsonErrorUnknown')); } - } } diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php index 038a7b52fe99..da76c9c4f812 100644 --- a/system/Exceptions/ConfigException.php +++ b/system/Exceptions/ConfigException.php @@ -3,12 +3,14 @@ /** * Exception for automatic logging. */ + class ConfigException extends CriticalError { /** * Error code - * @var int + * + * @var integer */ protected $code = 3; diff --git a/system/Exceptions/CriticalError.php b/system/Exceptions/CriticalError.php index b14302d30bc3..614bc140aafd 100644 --- a/system/Exceptions/CriticalError.php +++ b/system/Exceptions/CriticalError.php @@ -3,6 +3,7 @@ /** * Error: Critical conditions, like component unavailble, etc. */ + class CriticalError extends \Error { diff --git a/system/Exceptions/EmergencyError.php b/system/Exceptions/EmergencyError.php index 38aebabd7d93..832f135a0625 100644 --- a/system/Exceptions/EmergencyError.php +++ b/system/Exceptions/EmergencyError.php @@ -3,6 +3,7 @@ /** * Error: system is unusable */ + class EmergencyError extends \Error { diff --git a/system/Exceptions/ExceptionInterface.php b/system/Exceptions/ExceptionInterface.php index 48c716bf45fc..b36ebb027d78 100644 --- a/system/Exceptions/ExceptionInterface.php +++ b/system/Exceptions/ExceptionInterface.php @@ -6,6 +6,7 @@ * * catch (\CodeIgniter\Exceptions\ExceptionInterface) { ... } */ + interface ExceptionInterface { } diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php index ee1890c532fa..567e0530beaf 100644 --- a/system/Exceptions/FrameworkException.php +++ b/system/Exceptions/FrameworkException.php @@ -8,6 +8,7 @@ * * @package CodeIgniter\Exceptions */ + class FrameworkException extends \RuntimeException implements ExceptionInterface { diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php index 7bd3d58505b4..b70e440091aa 100644 --- a/system/Exceptions/PageNotFoundException.php +++ b/system/Exceptions/PageNotFoundException.php @@ -4,7 +4,8 @@ class PageNotFoundException extends \OutOfBoundsException implements ExceptionIn { /** * Error code - * @var int + * + * @var integer */ protected $code = 404; diff --git a/system/Files/File.php b/system/Files/File.php index d47ebb4b1de8..195d2ce2bb04 100644 --- a/system/Files/File.php +++ b/system/Files/File.php @@ -27,14 +27,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ + use SplFileInfo; use CodeIgniter\Files\Exceptions\FileException; use CodeIgniter\Files\Exceptions\FileNotFoundException; @@ -55,8 +56,8 @@ class File extends SplFileInfo * Run our SplFileInfo constructor with an optional verification * that the path is really a file. * - * @param string $path - * @param bool $checkFile + * @param string $path + * @param boolean $checkFile */ public function __construct(string $path, bool $checkFile = false) { @@ -82,7 +83,7 @@ public function __construct(string $path, bool $checkFile = false) * - kb Kilobytes * - mb Megabytes * - * @return int|null The file size in bytes or null if unknown. + * @return integer|null The file size in bytes or null if unknown. */ public function getSize(string $unit = 'b') { @@ -128,7 +129,7 @@ public function getMimeType(): string { if (function_exists('finfo_file')) { - $finfo = finfo_open(FILEINFO_MIME_TYPE); + $finfo = finfo_open(FILEINFO_MIME_TYPE); $mimeType = finfo_file($finfo, $this->getRealPath()); finfo_close($finfo); } @@ -160,17 +161,17 @@ public function getRandomName(): string * * @param string $targetPath * @param string|null $name - * @param bool $overwrite + * @param boolean $overwrite * - * @return bool + * @return boolean */ public function move(string $targetPath, string $name = null, bool $overwrite = false) { - $targetPath = rtrim($targetPath, '/') . '/'; - $name = $name ?? $this->getBaseName(); + $targetPath = rtrim($targetPath, '/') . '/'; + $name = $name ?? $this->getBaseName(); $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name); - if ( ! @rename($this->getPath(), $destination)) + if (! @rename($this->getPath(), $destination)) { $error = error_get_last(); throw FileException::forUnableToMove($this->getBasename(), $targetPath, strip_tags($error['message'])); @@ -190,9 +191,9 @@ public function move(string $targetPath, string $name = null, bool $overwrite = * last element is an integer as there may be cases that the delimiter may be present in the filename. * For the all other cases, it appends an integer starting from zero before the file's extension. * - * @param string $destination - * @param string $delimiter - * @param int $i + * @param string $destination + * @param string $delimiter + * @param integer $i * * @return string */ diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php index f73750957e13..0baa131b4909 100644 --- a/system/Filters/FilterInterface.php +++ b/system/Filters/FilterInterface.php @@ -27,14 +27,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ + use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 75720867fdd0..fc9d0af61983 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -27,14 +27,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ + use CodeIgniter\Config\BaseConfig; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; @@ -46,27 +47,31 @@ class Filters /** * The processed filters that will * be used to check against. + * * @var array */ protected $filters = [ 'before' => [], - 'after' => [] + 'after' => [], ]; /** * The original config file + * * @var BaseConfig */ protected $config; /** * The active IncomingRequest or CLIRequest + * * @var RequestInterface */ protected $request; /** * The active Response instance + * * @var ResponseInterface */ protected $response; @@ -74,7 +79,8 @@ class Filters /** * Whether we've done initial processing * on the filter lists. - * @var bool + * + * @var boolean */ protected $initialized = false; @@ -89,7 +95,7 @@ class Filters public function __construct($config, RequestInterface $request, ResponseInterface $response) { - $this->config = $config; + $this->config = $config; $this->request = & $request; $this->setResponse($response); } @@ -122,19 +128,19 @@ public function run(string $uri, $position = 'before') $alias = $rules; } - if ( ! array_key_exists($alias, $this->config->aliases)) + if (! array_key_exists($alias, $this->config->aliases)) { throw FilterException::forNoAlias($alias); } $class = new $this->config->aliases[$alias](); - if ( ! $class instanceof FilterInterface) + if (! $class instanceof FilterInterface) { throw FilterException::forIncorrectInterface(get_class($class)); } - if ($position == 'before') + if ($position === 'before') { $result = $class->before($this->request, $this->arguments[$alias] ?? null); @@ -160,7 +166,7 @@ public function run(string $uri, $position = 'before') return $result; } - elseif ($position == 'after') + elseif ($position === 'after') { $result = $class->after($this->request, $this->response); @@ -172,7 +178,7 @@ public function run(string $uri, $position = 'before') } } - return $position == 'before' ? $this->request : $this->response; + return $position === 'before' ? $this->request : $this->response; } //-------------------------------------------------------------------- @@ -279,7 +285,7 @@ public function enableFilter(string $name, string $when = 'before') list($name, $params) = explode(':', $name); $params = explode(',', $params); - array_walk($params, function(&$item){ + array_walk($params, function (&$item) { $item = trim($item); }); @@ -320,7 +326,7 @@ public function getArguments(string $key = null) protected function processGlobals(string $uri = null) { - if ( ! isset($this->config->globals) || ! is_array($this->config->globals)) + if (! isset($this->config->globals) || ! is_array($this->config->globals)) { return; } @@ -331,7 +337,7 @@ protected function processGlobals(string $uri = null) // Take any 'except' routes into consideration foreach ($this->config->globals['before'] as $alias => $rules) { - if ( ! is_array($rules) || ! array_key_exists('except', $rules)) + if (! is_array($rules) || ! array_key_exists('except', $rules)) { continue; } @@ -369,7 +375,7 @@ protected function processGlobals(string $uri = null) // Take any 'except' routes into consideration foreach ($this->config->globals['after'] as $alias => $rules) { - if ( ! is_array($rules) || ! array_key_exists('except', $rules)) + if (! is_array($rules) || ! array_key_exists('except', $rules)) { continue; } @@ -406,7 +412,7 @@ protected function processGlobals(string $uri = null) protected function processMethods() { - if ( ! isset($this->config->methods) || ! is_array($this->config->methods)) + if (! isset($this->config->methods) || ! is_array($this->config->methods)) { return; } @@ -425,7 +431,7 @@ protected function processMethods() protected function processFilters(string $uri = null) { - if ( ! isset($this->config->filters) || ! $this->config->filters) + if (! isset($this->config->filters) || ! $this->config->filters) { return; } @@ -454,7 +460,7 @@ protected function processFilters(string $uri = null) } $this->filters['before'] = array_merge($this->filters['before'], $matches); - $matches = []; + $matches = []; } // After diff --git a/system/Format/FormatterInterface.php b/system/Format/FormatterInterface.php index f7d1b979b30b..9a9e0c24d5ec 100644 --- a/system/Format/FormatterInterface.php +++ b/system/Format/FormatterInterface.php @@ -27,14 +27,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ + interface FormatterInterface { diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php index 241cdba6f3e7..4766da93ca37 100644 --- a/system/Format/JSONFormatter.php +++ b/system/Format/JSONFormatter.php @@ -27,12 +27,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php index 1c0ae0a43c43..a21f051e0bae 100644 --- a/system/Format/XMLFormatter.php +++ b/system/Format/XMLFormatter.php @@ -29,12 +29,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. * - * @package CodeIgniter - * @author CodeIgniter Dev Team - * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) - * @license https://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - * @since Version 3.0.0 + * @package CodeIgniter + * @author CodeIgniter Dev Team + * @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License + * @link https://codeigniter.com + * @since Version 3.0.0 * @filesource */ class XMLFormatter implements FormatterInterface @@ -53,12 +53,12 @@ public function format(array $data) // SimpleXML is installed but default // but best to check, and then provide a fallback. - if ( ! extension_loaded('simplexml')) + if (! extension_loaded('simplexml')) { throw FormatException::forMissingExtension(); } - $output = new \SimpleXMLElement("tags - * - Converts single and double quotes into correctly facing curly quote entities. - * - Converts three dots into ellipsis. - * - Converts double dashes into em-dashes. + * - Converts double spaces into paragraphs. + * - Converts single line breaks into
tags + * - Converts single and double quotes into correctly facing curly quote entities. + * - Converts three dots into ellipsis. + * - Converts double dashes into em-dashes. * - Converts two spaces into entities * - * @param string $str - * @param bool $reduce_linebreaks whether to reduce more then two consecutive newlines to two + * @param string $str + * @param boolean $reduce_linebreaks whether to reduce more then two consecutive newlines to two * - * @return string + * @return string */ public function autoTypography(string $str, bool $reduce_linebreaks = false): string { @@ -125,10 +124,10 @@ public function autoTypography(string $str, bool $reduce_linebreaks = false): st $html_comments = []; if (strpos($str, ''; - $this->assertEquals('foo ', sanitize_filename($filename)); - } - - public function testStripImageTags() - { - $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif')); - - $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('
'));
- }
-
- function test_encode_php_tags()
- {
- $this->assertEquals('<? echo $foo; ?>', encode_php_tags(''));
- }
+ public function setUp()
+ {
+ parent::setUp();
+
+ helper('security');
+ }
+
+ public function testSanitizeFilenameSimpleSuccess()
+ {
+ $this->assertEquals('hello.doc', sanitize_filename('hello.doc'));
+ }
+
+ public function testSanitizeFilenameStripsExtras()
+ {
+ $filename = './';
+ $this->assertEquals('foo ', sanitize_filename($filename));
+ }
+
+ public function testStripImageTags()
+ {
+ $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif'));
+
+ $this->assertEquals('http://example.com/spacer.gif', strip_image_tags(''));
+ }
+
+ function test_encode_php_tags()
+ {
+ $this->assertEquals('<? echo $foo; ?>', encode_php_tags(''));
+ }
}
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index e1f0d3c04354..d62b0b192ccf 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -5,353 +5,362 @@
class TextHelperTest extends \CIUnitTestCase
{
- private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
-
- public function setUp()
- {
- parent::setUp();
-
- helper('text');
- }
-
- // --------------------------------------------------------------------
-
- public function test_strip_slashes()
- {
- $expected = [
- "Is your name O'reilly?",
- "No, my name is O'connor."
- ];
- $str = [
- "Is your name O\'reilly?",
- "No, my name is O\'connor."
- ];
- $this->assertEquals($expected, strip_slashes($str));
- }
-
- // --------------------------------------------------------------------
- public function test_strip_quotes()
- {
- $strs = [
- '"me oh my!"' => 'me oh my!',
- "it's a winner!" => 'its a winner!',
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, strip_quotes($str));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_quotes_to_entities()
- {
- $strs = [
- '"me oh my!"' => '"me oh my!"',
- "it's a winner!" => 'it's a winner!',
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, quotes_to_entities($str));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_reduce_double_slashes()
- {
- $strs = [
- 'http://codeigniter.com' => 'http://codeigniter.com',
- '//var/www/html/example.com/' => '/var/www/html/example.com/',
- '/var/www/html//index.php' => '/var/www/html/index.php'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, reduce_double_slashes($str));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_reduce_multiples()
- {
- $strs = [
- 'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
- 'Ringo, John, Paul,,' => 'Ringo, John, Paul,'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, reduce_multiples($str));
- }
- $strs = [
- 'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
- 'Ringo, John, Paul,,' => 'Ringo, John, Paul'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, reduce_multiples($str, ',', TRUE));
- }
- }
-
- // --------------------------------------------------------------------
- public function test_random_string()
- {
- $this->assertEquals(16, strlen(random_string('alnum', 16)));
- $this->assertEquals(16, strlen(random_string('alpha', 16)));
- $this->assertEquals(16, strlen(random_string('nozero', 16)));
- $this->assertEquals(16, strlen(random_string('numeric', 16)));
- $this->assertEquals(8, strlen(random_string('numeric')));
-
- $this->assertInternalType('string', random_string('basic'));
- $this->assertEquals(16, strlen($random = random_string('crypto', 16)));
- $this->assertInternalType('string', $random);
-
- $this->assertEquals(32, strlen($random = random_string('md5')));
- $this->assertEquals(40, strlen($random = random_string('sha1')));
- }
-
- // --------------------------------------------------------------------
- public function test_increment_string()
- {
- $this->assertEquals('my-test_1', increment_string('my-test'));
- $this->assertEquals('my-test-1', increment_string('my-test', '-'));
- $this->assertEquals('file_5', increment_string('file_4'));
- $this->assertEquals('file-5', increment_string('file-4', '-'));
- $this->assertEquals('file-5', increment_string('file-4', '-'));
- $this->assertEquals('file-1', increment_string('file', '-', '1'));
- $this->assertEquals(124, increment_string('123', ''));
- }
-
- // -------------------------------------------------------------------
- // Functions from text_helper_test.php
- // -------------------------------------------------------------------
-
- public function test_word_limiter()
- {
- $this->assertEquals('Once upon a time,…', word_limiter($this->_long_string, 4));
- $this->assertEquals('Once upon a time,…', word_limiter($this->_long_string, 4, '…'));
- $this->assertEquals('', word_limiter('', 4));
- $this->assertEquals('Once upon a…', word_limiter($this->_long_string, 3, '…'));
- $this->assertEquals('Once upon a time', word_limiter('Once upon a time', 4, '…'));
- }
-
- // ------------------------------------------------------------------------
- public function test_character_limiter()
- {
- $this->assertEquals('Once upon a time, a…', character_limiter($this->_long_string, 20));
- $this->assertEquals('Once upon a time, a…', character_limiter($this->_long_string, 20, '…'));
- $this->assertEquals('Short', character_limiter('Short', 20));
- $this->assertEquals('Short', character_limiter('Short', 5));
- }
-
- // ------------------------------------------------------------------------
- public function test_ascii_to_entities()
- {
- $strs = [
- 'āā ātestā ' => '“‘ “test” ',
- 'ā Ā„ĀØĖĆøĆ„ĆāĘĀ©ĖāĖĀ¬' => '†¥¨ˆøåß∂ƒ©˙∆˚¬'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, ascii_to_entities($str));
- }
- }
-
- // ------------------------------------------------------------------------
- public function test_entities_to_ascii()
- {
- $strs = [
- '“‘ “test” ' => 'āā ātestā ',
- '†¥¨ˆøåß∂ƒ©˙∆˚¬' => 'ā Ā„ĀØĖĆøĆ„ĆāĘĀ©ĖāĖĀ¬'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, entities_to_ascii($str));
- }
- }
-
- public function testEntitiesToAsciiUnsafe()
- {
- $str = '<>';
- $this->assertEquals('<>', entities_to_ascii($str, true));
- $this->assertEquals('<>', entities_to_ascii($str, false));
- }
-
- public function testEntitiesToAsciiSmallOrdinals()
- {
- $str = '';
- $this->assertEquals(pack('c', 7), entities_to_ascii($str));
- }
-
- // ------------------------------------------------------------------------
- public function test_convert_accented_characters()
- {
- //$this->ci_vfs_clone('application/Config/ForeignChars.php');
- $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ĆĆĆĆĆĆĆĆĆÅĆĆĆÅø'));
- $this->assertEquals('a e i o u n ue', convert_accented_characters('Ć” Ć© Ć Ć³ Ćŗ Ʊ Ć¼'));
- }
-
- // ------------------------------------------------------------------------
- public function test_censored_words()
- {
- $censored = ['boob', 'nerd', 'ass', 'fart'];
- $strs = [
- 'Ted bobbled the ball' => 'Ted bobbled the ball',
- 'Jake is a nerdo' => 'Jake is a nerdo',
- 'The borg will assimilate you' => 'The borg will assimilate you',
- 'Did Mary Fart?' => 'Did Mary $*#?',
- 'Jake is really a boob' => 'Jake is really a $*#',
- 'Jake is really a (boob)' => 'Jake is really a ($*#)'
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, word_censor($str, $censored, '$*#'));
- }
- // test censored words being sent as a string
- $this->assertEquals('this is a test', word_censor('this is a test', 'test'));
- }
-
- // ------------------------------------------------------------------------
- public function test_highlight_code()
- {
- $expect = "\n<?php var_dump(\$this); ?> \n\n";
- $this->assertEquals($expect, highlight_code(''));
- }
-
- // ------------------------------------------------------------------------
- public function test_highlight_phrase()
- {
- $strs = [
- 'this is a phrase' => 'this is a phrase',
- 'this is another' => 'this is another',
- 'Gimme a test, Sally' => 'Gimme a test, Sally',
- 'Or tell me what this is' => 'Or tell me what this is',
- '' => ''
- ];
- foreach ($strs as $str => $expect)
- {
- $this->assertEquals($expect, highlight_phrase($str, 'this is'));
- }
- $this->assertEquals('this is a strong test', highlight_phrase('this is a strong test', 'this is', '', ''));
- }
-
- // ------------------------------------------------------------------------
- public function test_ellipsize()
- {
- $strs = [
- '0' => [
- 'this is my string' => '… my string',
- "here's another one" => '…nother one',
- 'this one is just a bit longer' => '…bit longer',
- 'short' => 'short'
- ],
- '.5' => [
- 'this is my string' => 'this …tring',
- "here's another one" => "here'…r one",
- 'this one is just a bit longer' => 'this …onger',
- 'short' => 'short'
- ],
- '1' => [
- 'this is my string' => 'this is my…',
- "here's another one" => "here's ano…",
- 'this one is just a bit longer' => 'this one i…',
- 'short' => 'short'
- ],
- ];
- foreach ($strs as $pos => $s)
- {
- foreach ($s as $str => $expect)
- {
- $this->assertEquals($expect, ellipsize($str, 10, $pos));
- }
- }
- }
-
- // ------------------------------------------------------------------------
- public function testWordWrap()
- {
- $string = 'Here is a simple string of text that will help us demonstrate this function.';
- $expected = "Here is a simple string\nof text that will help us\ndemonstrate this\nfunction.";
- $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
- $this->assertEquals($expected, word_wrap($string, 25));
-
- $string2 = "Here is a\nbroken up sentence\rspanning lines\r\nwoohoo!";
- $expected2 = "Here is a\nbroken up sentence\nspanning lines\nwoohoo!";
- $this->assertEquals(substr_count(word_wrap($string2, 25), "\n"), 3);
- $this->assertEquals($expected2, word_wrap($string2, 25));
-
- $string3 = "Here is another slightly longer\nbroken up sentence\rspanning lines\r\nwoohoo!";
- $expected3 = "Here is another slightly\nlonger\nbroken up sentence\nspanning lines\nwoohoo!";
- $this->assertEquals(substr_count(word_wrap($string3, 25), "\n"), 4);
- $this->assertEquals($expected3, word_wrap($string3, 25));
- }
-
- public function testWordWrapUnwrap()
- {
- $string = 'Here is a {unwrap}simple string of text{/unwrap} that will help us demonstrate this function.';
- $expected = "Here is a simple string of text\nthat will help us\ndemonstrate this\nfunction.";
- $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
- $this->assertEquals($expected, word_wrap($string, 25));
- }
-
- public function testWordWrapLongWords()
- {
- // the really really long word will be split
- $string = 'Here is an unbelievable super-complicated and reallyreallyquiteextraordinarily sophisticated sentence.';
- $expected = "Here is an unbelievable\nsuper-complicated and\nreallyreallyquiteextraor\ndinarily\nsophisticated sentence.";
- $this->assertEquals($expected, word_wrap($string, 25));
- }
-
- public function testWordWrapURL()
- {
- // the really really long word will be split
- $string = 'Here is an unbelievable super-complicated and http://www.reallyreallyquiteextraordinarily.com sophisticated sentence.';
- $expected = "Here is an unbelievable\nsuper-complicated and\nhttp://www.reallyreallyquiteextraordinarily.com\nsophisticated sentence.";
- $this->assertEquals($expected, word_wrap($string, 25));
- }
-
- // ------------------------------------------------------------------------
- public function test_default_word_wrap_charlim()
- {
- $string = "Here is a longer string of text that will help us demonstrate the default charlim of this function.";
- $this->assertEquals(strpos(word_wrap($string), "\n"), 73);
- }
-
- // -----------------------------------------------------------------------
-
- public function test_excerpt()
- {
- $string = $this->_long_string;
- $result = ' Once upon a time, a framework had no tests. It sad So some nice people began to write tests. The more time that went on, the happier it became. ...';
- $this->assertEquals(excerpt($string), $result);
- }
-
- // -----------------------------------------------------------------------
-
- public function test_excerpt_radius()
- {
- $string = $this->_long_string;
- $phrase = 'began';
- $result = '... people began to ...';
- $this->assertEquals(excerpt($string, $phrase, 10), $result);
- }
-
- // -----------------------------------------------------------------------
-
- public function test_alternator()
- {
- $phrase = ' scream! ';
- $result = '';
- alternator();
- for ($i = 0; $i < 4; $i ++ )
- $result .= alternator('I', 'you', 'we') . $phrase;
- $this->assertEquals('I scream! you scream! we scream! I scream! ', $result);
- }
-
- public function test_empty_alternator()
- {
- $phrase = ' scream! ';
- $result = '';
- for ($i = 0; $i < 4; $i ++ )
- $result .= alternator() . $phrase;
- $this->assertEquals(' scream! scream! scream! scream! ', $result);
- }
+ private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
+
+ public function setUp()
+ {
+ parent::setUp();
+
+ helper('text');
+ }
+
+ // --------------------------------------------------------------------
+
+ public function test_strip_slashes()
+ {
+ $expected = [
+ "Is your name O'reilly?",
+ "No, my name is O'connor.",
+ ];
+ $str = [
+ "Is your name O\'reilly?",
+ "No, my name is O\'connor.",
+ ];
+ $this->assertEquals($expected, strip_slashes($str));
+ }
+
+ // --------------------------------------------------------------------
+ public function test_strip_quotes()
+ {
+ $strs = [
+ '"me oh my!"' => 'me oh my!',
+ "it's a winner!" => 'its a winner!',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, strip_quotes($str));
+ }
+ }
+
+ // --------------------------------------------------------------------
+ public function test_quotes_to_entities()
+ {
+ $strs = [
+ '"me oh my!"' => '"me oh my!"',
+ "it's a winner!" => 'it's a winner!',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, quotes_to_entities($str));
+ }
+ }
+
+ // --------------------------------------------------------------------
+ public function test_reduce_double_slashes()
+ {
+ $strs = [
+ 'http://codeigniter.com' => 'http://codeigniter.com',
+ '//var/www/html/example.com/' => '/var/www/html/example.com/',
+ '/var/www/html//index.php' => '/var/www/html/index.php',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, reduce_double_slashes($str));
+ }
+ }
+
+ // --------------------------------------------------------------------
+ public function test_reduce_multiples()
+ {
+ $strs = [
+ 'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
+ 'Ringo, John, Paul,,' => 'Ringo, John, Paul,',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, reduce_multiples($str));
+ }
+ $strs = [
+ 'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
+ 'Ringo, John, Paul,,' => 'Ringo, John, Paul',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, reduce_multiples($str, ',', true));
+ }
+ }
+
+ // --------------------------------------------------------------------
+ public function test_random_string()
+ {
+ $this->assertEquals(16, strlen(random_string('alnum', 16)));
+ $this->assertEquals(16, strlen(random_string('alpha', 16)));
+ $this->assertEquals(16, strlen(random_string('nozero', 16)));
+ $this->assertEquals(16, strlen(random_string('numeric', 16)));
+ $this->assertEquals(8, strlen(random_string('numeric')));
+
+ $this->assertInternalType('string', random_string('basic'));
+ $this->assertEquals(16, strlen($random = random_string('crypto', 16)));
+ $this->assertInternalType('string', $random);
+
+ $this->assertEquals(32, strlen($random = random_string('md5')));
+ $this->assertEquals(40, strlen($random = random_string('sha1')));
+ }
+
+ // --------------------------------------------------------------------
+ public function test_increment_string()
+ {
+ $this->assertEquals('my-test_1', increment_string('my-test'));
+ $this->assertEquals('my-test-1', increment_string('my-test', '-'));
+ $this->assertEquals('file_5', increment_string('file_4'));
+ $this->assertEquals('file-5', increment_string('file-4', '-'));
+ $this->assertEquals('file-5', increment_string('file-4', '-'));
+ $this->assertEquals('file-1', increment_string('file', '-', '1'));
+ $this->assertEquals(124, increment_string('123', ''));
+ }
+
+ // -------------------------------------------------------------------
+ // Functions from text_helper_test.php
+ // -------------------------------------------------------------------
+
+ public function test_word_limiter()
+ {
+ $this->assertEquals('Once upon a time,…', word_limiter($this->_long_string, 4));
+ $this->assertEquals('Once upon a time,…', word_limiter($this->_long_string, 4, '…'));
+ $this->assertEquals('', word_limiter('', 4));
+ $this->assertEquals('Once upon a…', word_limiter($this->_long_string, 3, '…'));
+ $this->assertEquals('Once upon a time', word_limiter('Once upon a time', 4, '…'));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_character_limiter()
+ {
+ $this->assertEquals('Once upon a time, a…', character_limiter($this->_long_string, 20));
+ $this->assertEquals('Once upon a time, a…', character_limiter($this->_long_string, 20, '…'));
+ $this->assertEquals('Short', character_limiter('Short', 20));
+ $this->assertEquals('Short', character_limiter('Short', 5));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_ascii_to_entities()
+ {
+ $strs = [
+ 'āā ātestā ' => '“‘ “test” ',
+ 'ā Ā„ĀØĖĆøĆ„ĆāĘĀ©ĖāĖĀ¬' => '†¥¨ˆøåß∂ƒ©˙∆˚¬',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, ascii_to_entities($str));
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_entities_to_ascii()
+ {
+ $strs = [
+ '“‘ “test” ' => 'āā ātestā ',
+ '†¥¨ˆøåß∂ƒ©˙∆˚¬' => 'ā Ā„ĀØĖĆøĆ„ĆāĘĀ©ĖāĖĀ¬',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, entities_to_ascii($str));
+ }
+ }
+
+ public function testEntitiesToAsciiUnsafe()
+ {
+ $str = '<>';
+ $this->assertEquals('<>', entities_to_ascii($str, true));
+ $this->assertEquals('<>', entities_to_ascii($str, false));
+ }
+
+ public function testEntitiesToAsciiSmallOrdinals()
+ {
+ $str = '';
+ $this->assertEquals(pack('c', 7), entities_to_ascii($str));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_convert_accented_characters()
+ {
+ //$this->ci_vfs_clone('application/Config/ForeignChars.php');
+ $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ĆĆĆĆĆĆĆĆĆÅĆĆĆÅø'));
+ $this->assertEquals('a e i o u n ue', convert_accented_characters('Ć” Ć© Ć Ć³ Ćŗ Ʊ Ć¼'));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_censored_words()
+ {
+ $censored = [
+ 'boob',
+ 'nerd',
+ 'ass',
+ 'fart',
+ ];
+ $strs = [
+ 'Ted bobbled the ball' => 'Ted bobbled the ball',
+ 'Jake is a nerdo' => 'Jake is a nerdo',
+ 'The borg will assimilate you' => 'The borg will assimilate you',
+ 'Did Mary Fart?' => 'Did Mary $*#?',
+ 'Jake is really a boob' => 'Jake is really a $*#',
+ 'Jake is really a (boob)' => 'Jake is really a ($*#)',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, word_censor($str, $censored, '$*#'));
+ }
+ // test censored words being sent as a string
+ $this->assertEquals('this is a test', word_censor('this is a test', 'test'));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_highlight_code()
+ {
+ $expect = "\n<?php var_dump(\$this); ?> \n\n";
+ $this->assertEquals($expect, highlight_code(''));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_highlight_phrase()
+ {
+ $strs = [
+ 'this is a phrase' => 'this is a phrase',
+ 'this is another' => 'this is another',
+ 'Gimme a test, Sally' => 'Gimme a test, Sally',
+ 'Or tell me what this is' => 'Or tell me what this is',
+ '' => '',
+ ];
+ foreach ($strs as $str => $expect)
+ {
+ $this->assertEquals($expect, highlight_phrase($str, 'this is'));
+ }
+ $this->assertEquals('this is a strong test', highlight_phrase('this is a strong test', 'this is', '', ''));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_ellipsize()
+ {
+ $strs = [
+ '0' => [
+ 'this is my string' => '… my string',
+ "here's another one" => '…nother one',
+ 'this one is just a bit longer' => '…bit longer',
+ 'short' => 'short',
+ ],
+ '.5' => [
+ 'this is my string' => 'this …tring',
+ "here's another one" => "here'…r one",
+ 'this one is just a bit longer' => 'this …onger',
+ 'short' => 'short',
+ ],
+ '1' => [
+ 'this is my string' => 'this is my…',
+ "here's another one" => "here's ano…",
+ 'this one is just a bit longer' => 'this one i…',
+ 'short' => 'short',
+ ],
+ ];
+ foreach ($strs as $pos => $s)
+ {
+ foreach ($s as $str => $expect)
+ {
+ $this->assertEquals($expect, ellipsize($str, 10, $pos));
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ public function testWordWrap()
+ {
+ $string = 'Here is a simple string of text that will help us demonstrate this function.';
+ $expected = "Here is a simple string\nof text that will help us\ndemonstrate this\nfunction.";
+ $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
+ $this->assertEquals($expected, word_wrap($string, 25));
+
+ $string2 = "Here is a\nbroken up sentence\rspanning lines\r\nwoohoo!";
+ $expected2 = "Here is a\nbroken up sentence\nspanning lines\nwoohoo!";
+ $this->assertEquals(substr_count(word_wrap($string2, 25), "\n"), 3);
+ $this->assertEquals($expected2, word_wrap($string2, 25));
+
+ $string3 = "Here is another slightly longer\nbroken up sentence\rspanning lines\r\nwoohoo!";
+ $expected3 = "Here is another slightly\nlonger\nbroken up sentence\nspanning lines\nwoohoo!";
+ $this->assertEquals(substr_count(word_wrap($string3, 25), "\n"), 4);
+ $this->assertEquals($expected3, word_wrap($string3, 25));
+ }
+
+ public function testWordWrapUnwrap()
+ {
+ $string = 'Here is a {unwrap}simple string of text{/unwrap} that will help us demonstrate this function.';
+ $expected = "Here is a simple string of text\nthat will help us\ndemonstrate this\nfunction.";
+ $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
+ $this->assertEquals($expected, word_wrap($string, 25));
+ }
+
+ public function testWordWrapLongWords()
+ {
+ // the really really long word will be split
+ $string = 'Here is an unbelievable super-complicated and reallyreallyquiteextraordinarily sophisticated sentence.';
+ $expected = "Here is an unbelievable\nsuper-complicated and\nreallyreallyquiteextraor\ndinarily\nsophisticated sentence.";
+ $this->assertEquals($expected, word_wrap($string, 25));
+ }
+
+ public function testWordWrapURL()
+ {
+ // the really really long word will be split
+ $string = 'Here is an unbelievable super-complicated and http://www.reallyreallyquiteextraordinarily.com sophisticated sentence.';
+ $expected = "Here is an unbelievable\nsuper-complicated and\nhttp://www.reallyreallyquiteextraordinarily.com\nsophisticated sentence.";
+ $this->assertEquals($expected, word_wrap($string, 25));
+ }
+
+ // ------------------------------------------------------------------------
+ public function test_default_word_wrap_charlim()
+ {
+ $string = 'Here is a longer string of text that will help us demonstrate the default charlim of this function.';
+ $this->assertEquals(strpos(word_wrap($string), "\n"), 73);
+ }
+
+ // -----------------------------------------------------------------------
+
+ public function test_excerpt()
+ {
+ $string = $this->_long_string;
+ $result = ' Once upon a time, a framework had no tests. It sad So some nice people began to write tests. The more time that went on, the happier it became. ...';
+ $this->assertEquals(excerpt($string), $result);
+ }
+
+ // -----------------------------------------------------------------------
+
+ public function test_excerpt_radius()
+ {
+ $string = $this->_long_string;
+ $phrase = 'began';
+ $result = '... people began to ...';
+ $this->assertEquals(excerpt($string, $phrase, 10), $result);
+ }
+
+ // -----------------------------------------------------------------------
+
+ public function test_alternator()
+ {
+ $phrase = ' scream! ';
+ $result = '';
+ alternator();
+ for ($i = 0; $i < 4; $i ++)
+ {
+ $result .= alternator('I', 'you', 'we') . $phrase;
+ }
+ $this->assertEquals('I scream! you scream! we scream! I scream! ', $result);
+ }
+
+ public function test_empty_alternator()
+ {
+ $phrase = ' scream! ';
+ $result = '';
+ for ($i = 0; $i < 4; $i ++)
+ {
+ $result .= alternator() . $phrase;
+ }
+ $this->assertEquals(' scream! scream! scream! scream! ', $result);
+ }
}
diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
index bd678a6df8d4..6e2a78591bcf 100644
--- a/tests/system/Helpers/URLHelperTest.php
+++ b/tests/system/Helpers/URLHelperTest.php
@@ -25,14 +25,14 @@ public function setUp()
public function testSiteURLBasics()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -41,15 +41,15 @@ public function testSiteURLBasics()
public function testSiteURLHTTPS()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $_SERVER['HTTPS'] = 'on';
+ $_SERVER['HTTPS'] = 'on';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -58,14 +58,14 @@ public function testSiteURLHTTPS()
public function testSiteURLNoIndex()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = '';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -74,14 +74,14 @@ public function testSiteURLNoIndex()
public function testSiteURLDifferentIndex()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'banana.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -90,14 +90,14 @@ public function testSiteURLDifferentIndex()
public function testSiteURLNoIndexButPath()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = '';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -106,14 +106,14 @@ public function testSiteURLNoIndexButPath()
public function testSiteURLAttachesPath()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -122,14 +122,14 @@ public function testSiteURLAttachesPath()
public function testSiteURLAttachesScheme()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -138,14 +138,14 @@ public function testSiteURLAttachesScheme()
public function testSiteURLExample()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -154,14 +154,14 @@ public function testSiteURLExample()
public function testSiteURLSegments()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -173,14 +173,14 @@ public function testSiteURLSegments()
*/
public function testSiteURLWithSegments()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/test';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com/';
- $request = Services::request($config, false);
- $request->uri = new URI('http://example.com/test');
+ $request = Services::request($config, false);
+ $request->uri = new URI('http://example.com/test');
Services::injectMock('request', $request);
@@ -192,14 +192,14 @@ public function testSiteURLWithSegments()
*/
public function testSiteURLWithSegmentsAgain()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/test/page';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com';
- $request = Services::request($config, false);
- $request->uri = new URI('http://example.com/test/page');
+ $request = Services::request($config, false);
+ $request->uri = new URI('http://example.com/test/page');
Services::injectMock('request', $request);
@@ -212,7 +212,7 @@ public function testSiteURLWithSegmentsAgain()
public function testBaseURLBasics()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
$this->assertEquals('http://example.com', base_url());
@@ -220,7 +220,7 @@ public function testBaseURLBasics()
public function testBaseURLAttachesPath()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
$this->assertEquals('http://example.com/foo', base_url('foo'));
@@ -228,7 +228,7 @@ public function testBaseURLAttachesPath()
public function testBaseURLAttachesPathArray()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
$this->assertEquals('http://example.com/foo/bar', base_url(['foo', 'bar']));
@@ -236,7 +236,7 @@ public function testBaseURLAttachesPathArray()
public function testBaseURLAttachesScheme()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
$this->assertEquals('https://example.com/foo', base_url('foo', 'https'));
@@ -244,14 +244,14 @@ public function testBaseURLAttachesScheme()
public function testBaseURLHeedsBaseURL()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com/public';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/public');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/public');
Services::injectMock('request', $request);
@@ -260,7 +260,7 @@ public function testBaseURLHeedsBaseURL()
public function testBaseURLExample()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
$this->assertEquals('http://example.com/blog/post/123', base_url('blog/post/123'));
@@ -271,14 +271,14 @@ public function testBaseURLExample()
*/
public function testBaseURLWithSegments()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/test';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com/';
- $request = Services::request($config, false);
- $request->uri = new URI('http://example.com/test');
+ $request = Services::request($config, false);
+ $request->uri = new URI('http://example.com/test');
Services::injectMock('request', $request);
@@ -290,9 +290,9 @@ public function testBaseURLWithSegments()
*/
public function testBaseURLHTTPS()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $_SERVER['HTTPS'] = 'on';
+ $_SERVER['HTTPS'] = 'on';
$this->assertEquals('https://example.com/blog/post/123', base_url('blog/post/123'));
}
@@ -302,14 +302,14 @@ public function testBaseURLHTTPS()
*/
public function testBaseURLWithSegmentsAgain()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/test/page';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com';
- $request = Services::request($config, false);
- $request->uri = new URI('http://example.com/test/page');
+ $request = Services::request($config, false);
+ $request->uri = new URI('http://example.com/test/page');
Services::injectMock('request', $request);
@@ -322,14 +322,14 @@ public function testBaseURLWithSegmentsAgain()
public function testCurrentURLReturnsBasicURL()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com/public';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/public');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/public');
Services::injectMock('request', $request);
@@ -338,14 +338,14 @@ public function testCurrentURLReturnsBasicURL()
public function testCurrentURLReturnsObject()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com/public';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/public');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/public');
Services::injectMock('request', $request);
@@ -357,79 +357,79 @@ public function testCurrentURLReturnsObject()
public function testCurrentURLEquivalence()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
// Since we're on a CLI, we must provide our own URI
- $config = new App();
+ $config = new App();
$config->baseURL = 'http://example.com/';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/public');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/public');
Services::injectMock('request', $request);
$this->assertEquals(base_url(uri_string()), current_url());
}
- //--------------------------------------------------------------------
- // Test previous_url
+ //--------------------------------------------------------------------
+ // Test previous_url
- public function testPreviousURLUsesSessionFirst()
- {
- $uri1 = 'http://example.com/one?two';
- $uri2 = 'http://example.com/two?foo';
+ public function testPreviousURLUsesSessionFirst()
+ {
+ $uri1 = 'http://example.com/one?two';
+ $uri2 = 'http://example.com/two?foo';
- $_SERVER['HTTP_HOST'] = 'example.com';
- $_SERVER['REQUEST_URI'] = '/';
- $_SERVER['HTTP_REFERER'] = $uri1;
- $_SESSION['_ci_previous_url'] = $uri2;
+ $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['REQUEST_URI'] = '/';
+ $_SERVER['HTTP_REFERER'] = $uri1;
+ $_SESSION['_ci_previous_url'] = $uri2;
- // Since we're on a CLI, we must provide our own URI
- $config = new App();
- $config->baseURL = 'http://example.com/public';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/public');
+ // Since we're on a CLI, we must provide our own URI
+ $config = new App();
+ $config->baseURL = 'http://example.com/public';
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/public');
- Services::injectMock('request', $request);
+ Services::injectMock('request', $request);
- $this->assertEquals($uri2, previous_url());
- }
+ $this->assertEquals($uri2, previous_url());
+ }
//--------------------------------------------------------------------
- public function testPreviousURLUsesRefererIfNeeded()
- {
- $uri1 = 'http://example.com/one?two';
- $uri2 = 'http://example.com/two?foo';
+ public function testPreviousURLUsesRefererIfNeeded()
+ {
+ $uri1 = 'http://example.com/one?two';
+ $uri2 = 'http://example.com/two?foo';
- $_SERVER['HTTP_HOST'] = 'example.com';
- $_SERVER['REQUEST_URI'] = '/';
- $_SERVER['HTTP_REFERER'] = $uri1;
+ $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['REQUEST_URI'] = '/';
+ $_SERVER['HTTP_REFERER'] = $uri1;
- // Since we're on a CLI, we must provide our own URI
- $config = new App();
- $config->baseURL = 'http://example.com/public';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/public');
+ // Since we're on a CLI, we must provide our own URI
+ $config = new App();
+ $config->baseURL = 'http://example.com/public';
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/public');
- Services::injectMock('request', $request);
+ Services::injectMock('request', $request);
- $this->assertEquals($uri1, previous_url());
- }
+ $this->assertEquals($uri1, previous_url());
+ }
- //--------------------------------------------------------------------
+ //--------------------------------------------------------------------
// Test uri_string
public function testUriString()
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -439,15 +439,14 @@ public function testUriString()
public function testUriStringExample()
{
-
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/assets/image.jpg';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/assets/image.jpg');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/assets/image.jpg');
Services::injectMock('request', $request);
@@ -460,11 +459,11 @@ public function testUriStringExample()
public function testIndexPage()
{
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -473,11 +472,11 @@ public function testIndexPage()
public function testIndexPageAlt()
{
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'banana.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -490,13 +489,43 @@ public function testIndexPageAlt()
public function anchorNormalPatterns()
{
return [
- 'normal01' => ['http://example.com/index.php', ''],
- 'normal02' => ['Bananas', '/', 'Bananas'],
- 'normal03' => ['http://example.com/index.php', '/', '', 'fruit="peach"'],
- 'normal04' => ['Bananas', '/', 'Bananas', 'fruit=peach'],
- 'normal05' => ['http://example.com/index.php', '/', '', ['fruit' => 'peach']],
- 'normal06' => ['Bananas', '/', 'Bananas', ['fruit' => 'peach']],
- 'normal07' => ['http://example.com/index.php', '/'],
+ 'normal01' => [
+ 'http://example.com/index.php',
+ '',
+ ],
+ 'normal02' => [
+ 'Bananas',
+ '/',
+ 'Bananas',
+ ],
+ 'normal03' => [
+ 'http://example.com/index.php',
+ '/',
+ '',
+ 'fruit="peach"',
+ ],
+ 'normal04' => [
+ 'Bananas',
+ '/',
+ 'Bananas',
+ 'fruit=peach',
+ ],
+ 'normal05' => [
+ 'http://example.com/index.php',
+ '/',
+ '',
+ ['fruit' => 'peach'],
+ ],
+ 'normal06' => [
+ 'Bananas',
+ '/',
+ 'Bananas',
+ ['fruit' => 'peach'],
+ ],
+ 'normal07' => [
+ 'http://example.com/index.php',
+ '/',
+ ],
];
}
@@ -505,14 +534,14 @@ public function anchorNormalPatterns()
*/
public function testAnchor($expected = '', $uri = '', $title = '', $attributes = '')
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
$this->assertEquals($expected, anchor($uri, $title, $attributes, $config));
@@ -521,13 +550,43 @@ public function testAnchor($expected = '', $uri = '', $title = '', $attributes =
public function anchorNoindexPatterns()
{
return [
- 'noindex01' => ['http://example.com', ''],
- 'noindex02' => ['Bananas', '', 'Bananas'],
- 'noindex03' => ['http://example.com', '', '', 'fruit="peach"'],
- 'noindex04' => ['Bananas', '', 'Bananas', 'fruit=peach'],
- 'noindex05' => ['http://example.com', '', '', ['fruit' => 'peach']],
- 'noindex06' => ['Bananas', '', 'Bananas', ['fruit' => 'peach']],
- 'noindex07' => ['http://example.com', '/'],
+ 'noindex01' => [
+ 'http://example.com',
+ '',
+ ],
+ 'noindex02' => [
+ 'Bananas',
+ '',
+ 'Bananas',
+ ],
+ 'noindex03' => [
+ 'http://example.com',
+ '',
+ '',
+ 'fruit="peach"',
+ ],
+ 'noindex04' => [
+ 'Bananas',
+ '',
+ 'Bananas',
+ 'fruit=peach',
+ ],
+ 'noindex05' => [
+ 'http://example.com',
+ '',
+ '',
+ ['fruit' => 'peach'],
+ ],
+ 'noindex06' => [
+ 'Bananas',
+ '',
+ 'Bananas',
+ ['fruit' => 'peach'],
+ ],
+ 'noindex07' => [
+ 'http://example.com',
+ '/',
+ ],
];
}
@@ -536,14 +595,14 @@ public function anchorNoindexPatterns()
*/
public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attributes = '')
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = '';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
$this->assertEquals($expected, anchor($uri, $title, $attributes, $config));
@@ -552,12 +611,39 @@ public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attri
public function anchorSubpagePatterns()
{
return [
- 'subpage01' => ['http://example.com/mush', '/mush'],
- 'subpage02' => ['Bananas', '/mush', 'Bananas'],
- 'subpage03' => ['http://example.com/mush', '/mush', '', 'fruit="peach"'],
- 'subpage04' => ['Bananas', '/mush', 'Bananas', 'fruit=peach'],
- 'subpage05' => ['http://example.com/mush', '/mush', '', ['fruit' => 'peach']],
- 'subpage06' => ['Bananas', '/mush', 'Bananas', ['fruit' => 'peach']],
+ 'subpage01' => [
+ 'http://example.com/mush',
+ '/mush',
+ ],
+ 'subpage02' => [
+ 'Bananas',
+ '/mush',
+ 'Bananas',
+ ],
+ 'subpage03' => [
+ 'http://example.com/mush',
+ '/mush',
+ '',
+ 'fruit="peach"',
+ ],
+ 'subpage04' => [
+ 'Bananas',
+ '/mush',
+ 'Bananas',
+ 'fruit=peach',
+ ],
+ 'subpage05' => [
+ 'http://example.com/mush',
+ '/mush',
+ '',
+ ['fruit' => 'peach'],
+ ],
+ 'subpage06' => [
+ 'Bananas',
+ '/mush',
+ 'Bananas',
+ ['fruit' => 'peach'],
+ ],
];
}
@@ -566,14 +652,14 @@ public function anchorSubpagePatterns()
*/
public function testAnchorTargetted($expected = '', $uri = '', $title = '', $attributes = '')
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = '';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
$this->assertEquals($expected, anchor($uri, $title, $attributes, $config));
@@ -582,10 +668,28 @@ public function testAnchorTargetted($expected = '', $uri = '', $title = '', $att
public function anchorExamplePatterns()
{
return [
- 'egpage01' => ['My News', 'news/local/123', 'My News', 'title="News title"'],
- 'egpage02' => ['My News', 'news/local/123', 'My News', ['title' => 'The best news!']],
- 'egpage03' => ['Click here', '', 'Click here'],
- 'egpage04' => ['Click here', '/', 'Click here'],
+ 'egpage01' => [
+ 'My News',
+ 'news/local/123',
+ 'My News',
+ 'title="News title"',
+ ],
+ 'egpage02' => [
+ 'My News',
+ 'news/local/123',
+ 'My News',
+ ['title' => 'The best news!'],
+ ],
+ 'egpage03' => [
+ 'Click here',
+ '',
+ 'Click here',
+ ],
+ 'egpage04' => [
+ 'Click here',
+ '/',
+ 'Click here',
+ ],
];
}
@@ -594,14 +698,14 @@ public function anchorExamplePatterns()
*/
public function testAnchorExamples($expected = '', $uri = '', $title = '', $attributes = '')
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
$this->assertEquals($expected, anchor($uri, $title, $attributes, $config));
@@ -613,25 +717,40 @@ public function testAnchorExamples($expected = '', $uri = '', $title = '', $attr
public function anchorPopupPatterns()
{
return [
- 'normal01' => ['http://example.com/index.php', ''],
- 'normal02' => ['Bananas', '/', 'Bananas'],
- 'normal07' => ['http://example.com/index.php', '/'],
- 'normal08' => ['Click Me!',
- 'news/local/123', 'Click Me!', [
- 'width' => 800,
- 'height' => 600,
- 'scrollbars' => 'yes',
- 'status' => 'yes',
- 'resizable' => 'yes',
- 'screenx' => 0,
- 'screeny' => 0,
- 'window_name' => '_blank'
- ]],
- 'normal09' => [
+ 'normal01' => [
+ 'http://example.com/index.php',
+ '',
+ ],
+ 'normal02' => [
+ 'Bananas',
+ '/',
+ 'Bananas',
+ ],
+ 'normal07' => [
+ 'http://example.com/index.php',
+ '/',
+ ],
+ 'normal08' => [
'Click Me!',
'news/local/123',
'Click Me!',
- []],
+ [
+ 'width' => 800,
+ 'height' => 600,
+ 'scrollbars' => 'yes',
+ 'status' => 'yes',
+ 'resizable' => 'yes',
+ 'screenx' => 0,
+ 'screeny' => 0,
+ 'window_name' => '_blank',
+ ],
+ ],
+ 'normal09' => [
+ 'Click Me!',
+ 'news/local/123',
+ 'Click Me!',
+ [],
+ ],
];
}
@@ -640,14 +759,14 @@ public function anchorPopupPatterns()
*/
public function testAnchorPopup($expected = '', $uri = '', $title = '', $attributes = false)
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
$this->assertEquals($expected, anchor_popup($uri, $title, $attributes, $config));
@@ -659,9 +778,21 @@ public function testAnchorPopup($expected = '', $uri = '', $title = '', $attribu
public function mailtoPatterns()
{
return [
- 'page01' => ['Click Here to Contact Me', 'me@my-site.com', 'Click Here to Contact Me'],
- 'page02' => ['Contact Me', 'me@my-site.com', 'Contact Me', ['title' => 'Mail me']],
- 'page03' => ['me@my-site.com', 'me@my-site.com'],
+ 'page01' => [
+ 'Click Here to Contact Me',
+ 'me@my-site.com',
+ 'Click Here to Contact Me',
+ ],
+ 'page02' => [
+ 'Contact Me',
+ 'me@my-site.com',
+ 'Contact Me',
+ ['title' => 'Mail me'],
+ ],
+ 'page03' => [
+ 'me@my-site.com',
+ 'me@my-site.com',
+ ],
];
}
@@ -670,14 +801,14 @@ public function mailtoPatterns()
*/
public function testMailto($expected = '', $email, $title = '', $attributes = '')
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -690,12 +821,21 @@ public function testMailto($expected = '', $email, $title = '', $attributes = ''
public function safeMailtoPatterns()
{
return [
- 'page01' => ["",
- 'me@my-site.com', 'Click Here to Contact Me'],
- 'page02' => ["",
- 'me@my-site.com', 'Contact Me', ['title' => 'Mail me']],
- 'page03' => ["",
- 'me@my-site.com'],
+ 'page01' => [
+ "",
+ 'me@my-site.com',
+ 'Click Here to Contact Me',
+ ],
+ 'page02' => [
+ "",
+ 'me@my-site.com',
+ 'Contact Me',
+ ['title' => 'Mail me'],
+ ],
+ 'page03' => [
+ "",
+ 'me@my-site.com',
+ ],
];
}
@@ -704,14 +844,14 @@ public function safeMailtoPatterns()
*/
public function testSafeMailto($expected = '', $email, $title = '', $attributes = '')
{
- $_SERVER['HTTP_HOST'] = 'example.com';
+ $_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/';
- $config = new App();
- $config->baseURL = 'http://example.com';
+ $config = new App();
+ $config->baseURL = 'http://example.com';
$config->indexPage = 'index.php';
- $request = Services::request($config);
- $request->uri = new URI('http://example.com/');
+ $request = Services::request($config);
+ $request->uri = new URI('http://example.com/');
Services::injectMock('request', $request);
@@ -724,22 +864,38 @@ public function testSafeMailto($expected = '', $email, $title = '', $attributes
public function autolinkUrls()
{
return [
- 'test01' => ['www.codeigniter.com test',
- 'www.codeigniter.com test'],
- 'test02' => ['This is my noreply@codeigniter.com test',
- 'This is my noreply@codeigniter.com test'],
- 'test03' => ['www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - 'Visit example.com or email foo@bar.com'], - 'test08' => ['Visit www.example.com or email foo@bar.com', - 'Visit www.example.com or email foo@bar.com'], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + 'This is my noreply@codeigniter.com test', + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + 'Visit example.com or email foo@bar.com', + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + 'Visit www.example.com or email foo@bar.com', + ], ]; } @@ -754,22 +910,38 @@ public function testAutoLinkUrl($in, $out) public function autolinkEmails() { return [ - 'test01' => ['www.codeigniter.com test', - 'www.codeigniter.com test'], - 'test02' => ['This is my noreply@codeigniter.com test', - "This is my test"], - 'test03' => ['
www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - "Visit example.com or email "], - 'test08' => ['Visit www.example.com or email foo@bar.com', - "Visit www.example.com or email "], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + "This is my test", + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + "Visit example.com or email ", + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + "Visit www.example.com or email ", + ], ]; } @@ -784,22 +956,38 @@ public function testAutoLinkEmail($in, $out) public function autolinkBoth() { return [ - 'test01' => ['www.codeigniter.com test', - 'www.codeigniter.com test'], - 'test02' => ['This is my noreply@codeigniter.com test', - "This is my test"], - 'test03' => ['
www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - "Visit example.com or email "], - 'test08' => ['Visit www.example.com or email foo@bar.com', - "Visit www.example.com or email "], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + "This is my test", + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + "Visit example.com or email ", + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + "Visit www.example.com or email ", + ], ]; } @@ -814,22 +1002,38 @@ public function testAutolinkBoth($in, $out) public function autolinkPopup() { return [ - 'test01' => ['www.codeigniter.com test', - 'www.codeigniter.com test'], - 'test02' => ['This is my noreply@codeigniter.com test', - 'This is my noreply@codeigniter.com test'], - 'test03' => ['
www.google.com', - '
www.google.com'], - 'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.', - 'Download CodeIgniter at www.codeigniter.com. Period test.'], - 'test05' => ['Download CodeIgniter at www.codeigniter.com, comma test', - 'Download CodeIgniter at www.codeigniter.com, comma test'], - 'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com', - 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'], - 'test07' => ['Visit example.com or email foo@bar.com', - 'Visit example.com or email foo@bar.com'], - 'test08' => ['Visit www.example.com or email foo@bar.com', - 'Visit www.example.com or email foo@bar.com'], + 'test01' => [ + 'www.codeigniter.com test', + 'www.codeigniter.com test', + ], + 'test02' => [ + 'This is my noreply@codeigniter.com test', + 'This is my noreply@codeigniter.com test', + ], + 'test03' => [ + '
www.google.com', + '
www.google.com', + ], + 'test04' => [ + 'Download CodeIgniter at www.codeigniter.com. Period test.', + 'Download CodeIgniter at www.codeigniter.com. Period test.', + ], + 'test05' => [ + 'Download CodeIgniter at www.codeigniter.com, comma test', + 'Download CodeIgniter at www.codeigniter.com, comma test', + ], + 'test06' => [ + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + 'This one: ://codeigniter.com must not break this one: http://codeigniter.com', + ], + 'test07' => [ + 'Visit example.com or email foo@bar.com', + 'Visit example.com or email foo@bar.com', + ], + 'test08' => [ + 'Visit www.example.com or email foo@bar.com', + 'Visit www.example.com or email foo@bar.com', + ], ]; } @@ -858,21 +1062,21 @@ public function testPrepUrl() public function testUrlTitle() { $words = [ - 'foo bar /' => 'foo-bar', - '\ testing 12' => 'testing-12' + 'foo bar /' => 'foo-bar', + '\ testing 12' => 'testing-12', ]; foreach ($words as $in => $out) { - $this->assertEquals($out, url_title($in, '-', TRUE)); + $this->assertEquals($out, url_title($in, '-', true)); } } public function testUrlTitleExtraDashes() { $words = [ - '_foo bar_' => 'foo_bar', - '_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS' + '_foo bar_' => 'foo_bar', + '_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS', ]; foreach ($words as $in => $out) diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index 04e63f7101a0..1ad4ea6bddb3 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -20,22 +20,22 @@ class HoneypotTest extends CIUnitTestCase protected $request; protected $response; -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function setUp() { parent::setUp(); - $this->config = new \Config\Honeypot(); + $this->config = new \Config\Honeypot(); $this->honeypot = new Honeypot($this->config); unset($_POST[$this->config->name]); - $_SERVER['REQUEST_METHOD'] = 'POST'; + $_SERVER['REQUEST_METHOD'] = 'POST'; $_POST[$this->config->name] = 'hey'; - $this->request = Services::request(null,false); - $this->response = Services::response(); + $this->request = Services::request(null, false); + $this->response = Services::response(); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testAttachHoneypot() { @@ -48,7 +48,7 @@ public function testAttachHoneypot() $this->assertNotContains($this->config->name, $this->response->getBody()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testHasntContent() { @@ -63,7 +63,7 @@ public function testHasContent() $this->assertEquals(true, $this->honeypot->hasContent($this->request)); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testConfigHidden() { @@ -86,19 +86,19 @@ public function testConfigName() $this->honeypot = new Honeypot($this->config); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testHoneypotFilterBefore() { $config = [ - 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], - 'globals' => [ + 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], + 'globals' => [ 'before' => ['trap'], - 'after' => [] - ] + 'after' => [], + ], ]; $filters = new Filters((object) $config, $this->request, $this->response); - $uri = 'admin/foo/bar'; + $uri = 'admin/foo/bar'; $this->expectException(HoneypotException::class); $request = $filters->run($uri, 'before'); @@ -107,15 +107,15 @@ public function testHoneypotFilterBefore() public function testHoneypotFilterAfter() { $config = [ - 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], - 'globals' => [ + 'aliases' => ['trap' => 'CodeIgniter\Honeypot\fixtures\HoneyTrap'], + 'globals' => [ 'before' => [], - 'after' => ['trap'] - ] + 'after' => ['trap'], + ], ]; $filters = new Filters((object) $config, $this->request, $this->response); - $uri = 'admin/foo/bar'; + $uri = 'admin/foo/bar'; $this->response->setBody(''); $this->response = $filters->run($uri, 'after'); diff --git a/tests/system/Honeypot/fixtures/HoneyTrap.php b/tests/system/Honeypot/fixtures/HoneyTrap.php index 9ac8b2036bf9..8cc3aceef95e 100644 --- a/tests/system/Honeypot/fixtures/HoneyTrap.php +++ b/tests/system/Honeypot/fixtures/HoneyTrap.php @@ -30,8 +30,8 @@ public function before(RequestInterface $request) /** * Attach a honypot to the current response. * - * @param CodeIgniter\HTTP\RequestInterface $request - * @param CodeIgniter\HTTP\ResponseInterface $response + * @param CodeIgniter\HTTP\RequestInterface $request + * @param CodeIgniter\HTTP\ResponseInterface $response * @return mixed */ public function after(RequestInterface $request, ResponseInterface $response) diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php index d66aff1d018c..880fb5ec8c99 100644 --- a/tests/system/I18n/TimeDifferenceTest.php +++ b/tests/system/I18n/TimeDifferenceTest.php @@ -48,7 +48,7 @@ public function testHumanizeYearsSingle() public function testHumanizeYearsPlural() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 9, 2014 12:00:00', 'America/Chicago'); + $diff = $current->difference('March 9, 2014 12:00:00', 'America/Chicago'); $this->assertEquals('3 years ago', $diff->humanize('en')); } @@ -56,7 +56,7 @@ public function testHumanizeYearsPlural() public function testHumanizeYearsForward() { $current = Time::parse('January 1, 2017', 'America/Chicago'); - $diff = $current->difference('January 1, 2018 12:00:00', 'America/Chicago'); + $diff = $current->difference('January 1, 2018 12:00:00', 'America/Chicago'); $this->assertEquals('in 1 year', $diff->humanize('en')); } @@ -64,7 +64,7 @@ public function testHumanizeYearsForward() public function testHumanizeMonthsSingle() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('February 9, 2017', 'America/Chicago'); + $diff = $current->difference('February 9, 2017', 'America/Chicago'); $this->assertEquals('1 month ago', $diff->humanize('en')); } @@ -72,7 +72,7 @@ public function testHumanizeMonthsSingle() public function testHumanizeMonthsPlural() { $current = Time::parse('March 1, 2017', 'America/Chicago'); - $diff = $current->difference('January 1, 2017', 'America/Chicago'); + $diff = $current->difference('January 1, 2017', 'America/Chicago'); $this->assertEquals('2 months ago', $diff->humanize('en')); } @@ -80,7 +80,7 @@ public function testHumanizeMonthsPlural() public function testHumanizeMonthsForward() { $current = Time::parse('March 1, 2017', 'America/Chicago'); - $diff = $current->difference('May 1, 2017', 'America/Chicago'); + $diff = $current->difference('May 1, 2017', 'America/Chicago'); $this->assertEquals('in 1 month', $diff->humanize('en')); } @@ -88,7 +88,7 @@ public function testHumanizeMonthsForward() public function testHumanizeDaysSingle() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 9, 2017', 'America/Chicago'); + $diff = $current->difference('March 9, 2017', 'America/Chicago'); $this->assertEquals('1 day ago', $diff->humanize('en')); } @@ -96,7 +96,7 @@ public function testHumanizeDaysSingle() public function testHumanizeDaysPlural() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 8, 2017', 'America/Chicago'); + $diff = $current->difference('March 8, 2017', 'America/Chicago'); $this->assertEquals('2 days ago', $diff->humanize('en')); } @@ -104,7 +104,7 @@ public function testHumanizeDaysPlural() public function testHumanizeDaysForward() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 11, 2017', 'America/Chicago'); + $diff = $current->difference('March 11, 2017', 'America/Chicago'); $this->assertEquals('in 1 day', $diff->humanize('en')); } @@ -112,7 +112,7 @@ public function testHumanizeDaysForward() public function testHumanizeHoursSingle() { $current = Time::parse('March 10, 2017 12:00', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 11:00', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 11:00', 'America/Chicago'); $this->assertEquals('1 hour ago', $diff->humanize('en')); } @@ -120,7 +120,7 @@ public function testHumanizeHoursSingle() public function testHumanizeHoursPlural() { $current = Time::parse('March 10, 2017 12:00', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 10:00', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 10:00', 'America/Chicago'); $this->assertEquals('2 hours ago', $diff->humanize('en')); } @@ -128,7 +128,7 @@ public function testHumanizeHoursPlural() public function testHumanizeHoursForward() { $current = Time::parse('March 10, 2017 12:00', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 13:00', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 13:00', 'America/Chicago'); $this->assertEquals('in 1 hour', $diff->humanize('en')); } @@ -136,7 +136,7 @@ public function testHumanizeHoursForward() public function testHumanizeMinutesSingle() { $current = Time::parse('March 10, 2017 12:30', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 12:29', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 12:29', 'America/Chicago'); $this->assertEquals('1 minute ago', $diff->humanize('en')); } @@ -144,7 +144,7 @@ public function testHumanizeMinutesSingle() public function testHumanizeMinutesPlural() { $current = Time::parse('March 10, 2017 12:30', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 12:28', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 12:28', 'America/Chicago'); $this->assertEquals('2 minutes ago', $diff->humanize('en')); } @@ -152,7 +152,7 @@ public function testHumanizeMinutesPlural() public function testHumanizeMinutesForward() { $current = Time::parse('March 10, 2017 12:30', 'America/Chicago'); - $diff = $current->difference('March 10, 2017 12:31', 'America/Chicago'); + $diff = $current->difference('March 10, 2017 12:31', 'America/Chicago'); $this->assertEquals('in 1 minute', $diff->humanize('en')); } @@ -160,7 +160,7 @@ public function testHumanizeMinutesForward() public function testHumanizeWeeksSingle() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 2, 2017', 'America/Chicago'); + $diff = $current->difference('March 2, 2017', 'America/Chicago'); $this->assertEquals('1 week ago', $diff->humanize('en')); } @@ -168,7 +168,7 @@ public function testHumanizeWeeksSingle() public function testHumanizeWeeksPlural() { $current = Time::parse('March 30, 2017', 'America/Chicago'); - $diff = $current->difference('March 15, 2017', 'America/Chicago'); + $diff = $current->difference('March 15, 2017', 'America/Chicago'); $this->assertEquals('2 weeks ago', $diff->humanize('en')); } @@ -176,7 +176,7 @@ public function testHumanizeWeeksPlural() public function testHumanizeWeeksForward() { $current = Time::parse('March 10, 2017', 'America/Chicago'); - $diff = $current->difference('March 18, 2017', 'America/Chicago'); + $diff = $current->difference('March 18, 2017', 'America/Chicago'); $this->assertEquals('in 1 week', $diff->humanize('en')); } diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php index 93d709943d52..b159eb436840 100644 --- a/tests/system/I18n/TimeTest.php +++ b/tests/system/I18n/TimeTest.php @@ -87,7 +87,7 @@ public function testToDateTime() public function testNow() { - $time = Time::now(); + $time = Time::now(); $time1 = new \DateTime(); $this->assertInstanceOf(Time::class, $time); @@ -96,7 +96,7 @@ public function testNow() public function testParse() { - $time = Time::parse('next Tuesday', 'America/Chicago'); + $time = Time::parse('next Tuesday', 'America/Chicago'); $time1 = new \DateTime('now', new \DateTimeZone('America/Chicago')); $time1->modify('next Tuesday'); @@ -306,7 +306,7 @@ public function testGetWeekOfYear() public function testGetTimestamp() { - $time = Time::parse('August 12, 2016 4:15:23pm'); + $time = Time::parse('August 12, 2016 4:15:23pm'); $expected = strtotime('August 12, 2016 4:15:23pm'); $this->assertEquals($expected, $time->timestamp); @@ -359,7 +359,7 @@ public function testGetTimezonename() public function testSetYear() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setYear(2015); $this->assertInstanceOf(Time::class, $time2); @@ -369,7 +369,7 @@ public function testSetYear() public function testSetMonthNumber() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMonth(4); $this->assertInstanceOf(Time::class, $time2); @@ -379,7 +379,7 @@ public function testSetMonthNumber() public function testSetMonthLongName() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMonth('April'); $this->assertInstanceOf(Time::class, $time2); @@ -389,7 +389,7 @@ public function testSetMonthLongName() public function testSetMonthShortName() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMonth('Feb'); $this->assertInstanceOf(Time::class, $time2); @@ -399,36 +399,36 @@ public function testSetMonthShortName() public function testSetDay() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setDay(15); $this->assertInstanceOf(Time::class, $time2); $this->assertNotSame($time, $time2); $this->assertEquals('2017-05-15 00:00:00', $time2->toDateTimeString()); - } + } - /** - * @expectedException \CodeIgniter\I18n\Exceptions\I18nException - */ - public function testSetDayOverMaxInCurrentMonth() - { + /** + * @expectedException \CodeIgniter\I18n\Exceptions\I18nException + */ + public function testSetDayOverMaxInCurrentMonth() + { $time = Time::parse('Feb 02, 2009'); - $time->setDay(29); - } + $time->setDay(29); + } - public function testSetDayNotOverMaxInCurrentMonth() - { - $time = Time::parse('Feb 02, 2012'); - $time2 = $time->setDay(29); + public function testSetDayNotOverMaxInCurrentMonth() + { + $time = Time::parse('Feb 02, 2012'); + $time2 = $time->setDay(29); - $this->assertInstanceOf(Time::class, $time2); + $this->assertInstanceOf(Time::class, $time2); $this->assertNotSame($time, $time2); $this->assertEquals('2012-02-29 00:00:00', $time2->toDateTimeString()); } public function testSetHour() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setHour(15); $this->assertInstanceOf(Time::class, $time2); @@ -438,7 +438,7 @@ public function testSetHour() public function testSetMinute() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setMinute(30); $this->assertInstanceOf(Time::class, $time2); @@ -448,7 +448,7 @@ public function testSetMinute() public function testSetSecond() { - $time = Time::parse('May 10, 2017'); + $time = Time::parse('May 10, 2017'); $time2 = $time->setSecond(20); $this->assertInstanceOf(Time::class, $time2); @@ -548,7 +548,7 @@ public function testSetSecondTooBig() public function testSetTimezone() { - $time = Time::parse('May 10, 2017', 'America/Chicago'); + $time = Time::parse('May 10, 2017', 'America/Chicago'); $time2 = $time->setTimezone('Europe/London'); $this->assertInstanceOf(Time::class, $time2); @@ -559,7 +559,7 @@ public function testSetTimezone() public function testSetTimestamp() { - $time = Time::parse('May 10, 2017', 'America/Chicago'); + $time = Time::parse('May 10, 2017', 'America/Chicago'); $stamp = strtotime('April 1, 2017'); $time2 = $time->setTimestamp($stamp); @@ -579,11 +579,11 @@ public function testToDateString() * shows a numeric version of the month instead of the textual version. * Not sure what the fix is just yet.... */ -// public function testToFormattedDateString() -// { -// $time = Time::parse('February 10, 2017', 'America/Chicago'); -// $this->assertEquals('Feb 10, 2017', $time->toFormattedDateString()); -// } + // public function testToFormattedDateString() + // { + // $time = Time::parse('February 10, 2017', 'America/Chicago'); + // $this->assertEquals('Feb 10, 2017', $time->toFormattedDateString()); + // } public function testToTimeString() { @@ -597,7 +597,7 @@ public function testToTimeString() public function testCanAddSeconds() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addSeconds(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:20:43', $newTime->toDateTimeString()); @@ -605,7 +605,7 @@ public function testCanAddSeconds() public function testCanAddMinutes() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addMinutes(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:30:33', $newTime->toDateTimeString()); @@ -613,7 +613,7 @@ public function testCanAddMinutes() public function testCanAddHours() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addHours(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 16:20:33', $newTime->toDateTimeString()); @@ -621,7 +621,7 @@ public function testCanAddHours() public function testCanAddDays() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addDays(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-13 13:20:33', $newTime->toDateTimeString()); @@ -629,7 +629,7 @@ public function testCanAddDays() public function testCanAddMonths() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addMonths(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-04-10 13:20:33', $newTime->toDateTimeString()); @@ -637,7 +637,7 @@ public function testCanAddMonths() public function testCanAddMonthsOverYearBoundary() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addMonths(13); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2018-02-10 13:20:33', $newTime->toDateTimeString()); @@ -645,7 +645,7 @@ public function testCanAddMonthsOverYearBoundary() public function testCanAddYears() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->addYears(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2020-01-10 13:20:33', $newTime->toDateTimeString()); @@ -653,7 +653,7 @@ public function testCanAddYears() public function testCanSubtractSeconds() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subSeconds(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:20:23', $newTime->toDateTimeString()); @@ -661,7 +661,7 @@ public function testCanSubtractSeconds() public function testCanSubtractMinutes() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subMinutes(10); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 13:10:33', $newTime->toDateTimeString()); @@ -669,7 +669,7 @@ public function testCanSubtractMinutes() public function testCanSubtractHours() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subHours(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-10 10:20:33', $newTime->toDateTimeString()); @@ -677,7 +677,7 @@ public function testCanSubtractHours() public function testCanSubtractDays() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subDays(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2017-01-07 13:20:33', $newTime->toDateTimeString()); @@ -685,7 +685,7 @@ public function testCanSubtractDays() public function testCanSubtractMonths() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subMonths(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2016-10-10 13:20:33', $newTime->toDateTimeString()); @@ -693,7 +693,7 @@ public function testCanSubtractMonths() public function testCanSubtractYears() { - $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); + $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago'); $newTime = $time->subYears(3); $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString()); $this->assertEquals('2014-01-10 13:20:33', $newTime->toDateTimeString()); @@ -941,5 +941,4 @@ public function testHumanizeWeeksForward() $this->assertEquals('in 2 weeks', $time->humanize()); } - } diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php index 8a209fc7b198..52d79d68f9ac 100644 --- a/tests/system/Images/BaseHandlerTest.php +++ b/tests/system/Images/BaseHandlerTest.php @@ -5,7 +5,7 @@ /** * Test the common image processing functionality. - * + * * Note: some of the underlying PHP functions do not play nicely * with vfsStream, so the support files are used directly for * most work, and the virtual file system will be used for @@ -16,7 +16,7 @@ class BaseHandlerTest extends \CIUnitTestCase public function setUp() { - if ( ! extension_loaded('gd')) + if (! extension_loaded('gd')) { $this->markTestSkipped('The GD extension is not available.'); return; @@ -28,14 +28,17 @@ public function setUp() $this->origin = SUPPORTPATH . 'Images/'; vfsStream::copyFromFileSystem($this->origin, $this->root); // make subfolders - $structure = ['work' => [], 'wontwork' => []]; + $structure = [ + 'work' => [], + 'wontwork' => [], + ]; vfsStream::create($structure); // with one of them read only $wont = $this->root->getChild('wontwork')->chmod(0400); // for VFS tests - $this->start = $this->root->url() . '/'; - $this->path = $this->start . 'ci-logo.png'; + $this->start = $this->root->url() . '/'; + $this->path = $this->start . 'ci-logo.png'; } //-------------------------------------------------------------------- @@ -48,7 +51,7 @@ public function testNew() public function testWithFile() { - $path = $this->origin . 'ci-logo.png'; + $path = $this->origin . 'ci-logo.png'; $handler = Services::image('gd', null, false); $handler->withFile($path); diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php index 1bcac5fcc479..8bc6e1f536a2 100644 --- a/tests/system/Images/GDHandlerTest.php +++ b/tests/system/Images/GDHandlerTest.php @@ -10,7 +10,7 @@ * different transformations, so we have to rely on the underlying package. * We can make sure that we can call it without blowing up, * and we can make sure the code coverage is good. - * + * * Was unable to test fontPath & related logic. */ class GDHandlerTest extends \CIUnitTestCase @@ -18,7 +18,7 @@ class GDHandlerTest extends \CIUnitTestCase public function setUp() { - if ( ! extension_loaded('gd')) + if (! extension_loaded('gd')) { $this->markTestSkipped('The GD extension is not available.'); return; @@ -29,14 +29,17 @@ public function setUp() // copy our support files $this->origin = SUPPORTPATH . 'Images/'; // make subfolders - $structure = ['work' => [], 'wontwork' => []]; + $structure = [ + 'work' => [], + 'wontwork' => [], + ]; vfsStream::create($structure); // with one of them read only $wont = $this->root->getChild('wontwork')->chmod(0400); $this->start = $this->root->url() . '/'; - $this->path = $this->origin . 'ci-logo.png'; + $this->path = $this->origin . 'ci-logo.png'; $this->handler = Services::image('gd', null, false); } @@ -53,7 +56,7 @@ public function testGetVersion() public function testImageProperties() { $this->handler->withFile($this->path); - $file = $this->handler->getFile(); + $file = $this->handler->getFile(); $props = $file->getProperties(true); $this->assertEquals(155, $this->handler->getWidth()); @@ -70,14 +73,14 @@ public function testImageProperties() public function testImageTypeProperties() { $this->handler->withFile($this->path); - $file = $this->handler->getFile(); + $file = $this->handler->getFile(); $props = $file->getProperties(true); $this->assertEquals(IMAGETYPE_PNG, $props['image_type']); $this->assertEquals('image/png', $props['mime_type']); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testResizeIgnored() { @@ -119,7 +122,7 @@ public function testResizeAspectHeight() $this->assertEquals(456, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testCropTopLeft() { @@ -169,7 +172,7 @@ public function testCropOutOfBounds() $this->assertEquals(100, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testRotate() { @@ -193,7 +196,7 @@ public function testRotateBadAngle() $this->handler->rotate(77); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testFlatten() { @@ -203,7 +206,7 @@ public function testFlatten() $this->assertEquals(200, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testFlip() { @@ -236,7 +239,7 @@ public function testFlipUnknown() $this->handler->flip('bogus'); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testFit() { $this->handler->withFile($this->path); @@ -263,7 +266,17 @@ public function testFitAutoHeight() public function testFitPositions() { - $choices = ['top-left', 'top', 'top-right', 'left', 'center', 'right', 'bottom-left', 'bottom', 'bottom-right']; + $choices = [ + 'top-left', + 'top', + 'top-right', + 'left', + 'center', + 'right', + 'bottom-left', + 'bottom', + 'bottom-right', + ]; $this->handler->withFile($this->path); foreach ($choices as $position) { @@ -273,7 +286,7 @@ public function testFitPositions() } } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testText() { @@ -283,7 +296,7 @@ public function testText() $this->assertEquals(200, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testMoreText() { @@ -293,7 +306,7 @@ public function testMoreText() $this->assertEquals(200, $this->handler->getHeight()); } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testImageCreation() { @@ -306,7 +319,7 @@ public function testImageCreation() } } -//-------------------------------------------------------------------- + //-------------------------------------------------------------------- public function testImageSave() { diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php index 8446f0d5aa79..69257038b21c 100644 --- a/tests/system/Images/ImageTest.php +++ b/tests/system/Images/ImageTest.php @@ -16,7 +16,10 @@ public function setup() $this->origin = '_support/Images/'; vfsStream::copyFromFileSystem(TESTPATH . $this->origin, $this->root); // make subfolders - $structure = ['work' => [], 'wontwork' => []]; + $structure = [ + 'work' => [], + 'wontwork' => [], + ]; vfsStream::create($structure); // with one of them read only $wont = $this->root->getChild('wontwork')->chmod(0400); @@ -37,11 +40,11 @@ public function testBasicPropertiesInherited() public function testGetProperties() { $expected = [ - 'width' => 155, - 'height' => 200, + 'width' => 155, + 'height' => 200, 'image_type' => IMAGETYPE_PNG, - 'size_str' => 'width="155" height="200"', - 'mime_type' => "image/png", + 'size_str' => 'width="155" height="200"', + 'mime_type' => 'image/png', ]; $this->assertEquals($expected, $this->image->getProperties(true)); @@ -56,7 +59,7 @@ public function testExtractProperties() $this->assertEquals(200, $this->image->origHeight); $this->assertEquals(IMAGETYPE_PNG, $this->image->imageType); $this->assertEquals('width="155" height="200"', $this->image->sizeStr); - $this->assertEquals("image/png", $this->image->mime); + $this->assertEquals('image/png', $this->image->mime); } public function testCopyDefaultName() diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php index 152e61bdef40..0041dd0fc3e7 100644 --- a/tests/system/Language/LanguageTest.php +++ b/tests/system/Language/LanguageTest.php @@ -20,8 +20,8 @@ public function testGetLineReturnsLine() $lang = new MockLanguage('en'); $lang->setData([ - 'bookSaved' => 'We kept the book free from the boogeyman', - 'booksSaved' => 'We saved some more' + 'bookSaved' => 'We kept the book free from the boogeyman', + 'booksSaved' => 'We saved some more', ]); $this->assertEquals('We saved some more', $lang->getLine('books.booksSaved')); @@ -36,14 +36,14 @@ public function testGetLineArrayReturnsLineArray() $lang->setData([ 'booksList' => [ 'The Boogeyman', - 'We Saved' - ] + 'We Saved', + ], ]); $this->assertEquals([ 'The Boogeyman', - 'We Saved' - ], $lang->getLine('books.booksList')); + 'We Saved', + ], $lang->getLine('books.booksList')); } //-------------------------------------------------------------------- @@ -51,13 +51,15 @@ public function testGetLineArrayReturnsLineArray() public function testGetLineFormatsMessage() { // No intl extension? then we can't test this - go away.... - if ( ! class_exists('\MessageFormatter')) + if (! class_exists('\MessageFormatter')) + { return; + } $lang = new MockLanguage('en'); $lang->setData([ - 'bookCount' => '{0, number, integer} books have been saved.' + 'bookCount' => '{0, number, integer} books have been saved.', ]); $this->assertEquals('45 books have been saved.', $lang->getLine('books.bookCount', [91 / 2])); @@ -68,7 +70,7 @@ public function testGetLineFormatsMessage() public function testGetLineArrayFormatsMessages() { // No intl extension? Then we can't test this - go away... - if ( ! class_exists('\MessageFormatter')) + if (! class_exists('\MessageFormatter')) { return; } @@ -78,7 +80,7 @@ public function testGetLineArrayFormatsMessages() $lang->setData([ 'bookList' => [ '{0, number, integer} related books.' - ] + ], ]); $this->assertEquals(['45 related books.'], $lang->getLine('books.bookList', [91 / 2])); @@ -108,7 +110,7 @@ public function testLangDoesntFormat() $lang->setData([ 'bookList' => [ '{0, number, integer} related books.' - ] + ], ]); $this->assertEquals(['{0, number, integer} related books.'], $lang->getLine('books.bookList', [15])); diff --git a/tests/system/Log/ChromeLoggerHandlerTest.php b/tests/system/Log/ChromeLoggerHandlerTest.php index e48e286ec32f..14253e960ef8 100644 --- a/tests/system/Log/ChromeLoggerHandlerTest.php +++ b/tests/system/Log/ChromeLoggerHandlerTest.php @@ -9,7 +9,7 @@ class ChromeLoggerHandlerTest extends \CIUnitTestCase public function testCanHandleLogLevel() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); @@ -20,18 +20,18 @@ public function testCanHandleLogLevel() public function testHandle() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); - $this->assertTrue($logger->handle("warning", "This a log test")); + $this->assertTrue($logger->handle('warning', 'This a log test')); } //-------------------------------------------------------------------- public function testSendLogs() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); @@ -46,7 +46,7 @@ public function testSendLogs() public function testSetDateFormat() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); @@ -60,14 +60,14 @@ public function testSetDateFormat() public function testObjectMessage() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; - $logger = new MockChromeHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); - $data = new \stdClass(); - $data->code = 123; + $logger = new MockChromeHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); + $data = new \stdClass(); + $data->code = 123; $data->explanation = "That's no moon, it's a pumpkin"; - $result = $logger->setDateFormat('F j, Y'); + $result = $logger->setDateFormat('F j, Y'); $logger->handle('debug', $data); $peek = $logger->peekaboo(); diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php index fb54ac548aef..e6b5e1d09375 100644 --- a/tests/system/Log/LoggerTest.php +++ b/tests/system/Log/LoggerTest.php @@ -11,7 +11,7 @@ class LoggerTest extends \CIUnitTestCase public function testThrowsExceptionWithBadHandlerSettings() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers = null; $this->expectException(FrameworkException::class); @@ -38,7 +38,7 @@ public function testLogThrowsExceptionOnInvalidLevel() public function testLogReturnsFalseWhenLogNotHandled() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->threshold = 3; $logger = new Logger($config); @@ -51,7 +51,7 @@ public function testLogReturnsFalseWhenLogNotHandled() public function testLogActuallyLogs() { $config = new LoggerConfig(); -// $Config->handlers['TestHandler']['handles'] = [LogLevel::CRITICAL]; + // $Config->handlers['TestHandler']['handles'] = [LogLevel::CRITICAL]; $logger = new Logger($config); @@ -69,7 +69,7 @@ public function testLogActuallyLogs() public function testLogDoesnotLogUnhandledLevels() { - $config = new LoggerConfig(); + $config = new LoggerConfig(); $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new Logger($config); @@ -107,7 +107,7 @@ public function testLogInterpolatesPost() $logger = new Logger($config); - $_POST = ['foo' => 'bar']; + $_POST = ['foo' => 'bar']; $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_POST: ' . print_r($_POST, true); $logger->log('debug', 'Test message {post_vars}'); @@ -126,7 +126,7 @@ public function testLogInterpolatesGet() $logger = new Logger($config); - $_GET = ['bar' => 'baz']; + $_GET = ['bar' => 'baz']; $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_GET: ' . print_r($_GET, true); $logger->log('debug', 'Test message {get_vars}'); @@ -228,7 +228,8 @@ public function testLogInterpolatesExceptions() try { throw new Exception('These are not the droids you are looking for'); - } catch (\Exception $e) + } + catch (\Exception $e) { $logger->log('error', '[ERROR] {exception}', ['exception' => $e]); } @@ -415,7 +416,7 @@ public function testFilenameCleaning() $config = new LoggerConfig(); $logger = new \Tests\Support\Log\TestLogger($config); - $ohoh = APPPATH . 'LoggerTest'; + $ohoh = APPPATH . 'LoggerTest'; $expected = 'APPPATH/LoggerTest'; $this->assertEquals($expected, $logger->cleanup($ohoh)); diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php index e410c9b2ea77..368c18b7a001 100644 --- a/tests/system/Pager/PagerRendererTest.php +++ b/tests/system/Pager/PagerRendererTest.php @@ -13,7 +13,7 @@ public function setUp() { parent::setUp(); - $this->uri = new URI('http://example.com/foo'); + $this->uri = new URI('http://example.com/foo'); $this->expect = 'http://example.com/foo?page='; } @@ -22,10 +22,10 @@ public function setUp() public function testHasPreviousReturnsFalseWhenFirstIsOne() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 5, - 'currentPage' => 1, - 'total' => 100 + 'uri' => $this->uri, + 'pageCount' => 5, + 'currentPage' => 1, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -41,10 +41,10 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOne() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 10, - 'currentPage' => 5, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 10, + 'currentPage' => 5, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -62,10 +62,10 @@ public function testGetPreviousWhenSurroundCountIsZero() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -83,10 +83,10 @@ public function testHasNextReturnsFalseWhenLastIsTotal() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 5, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 5, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -103,10 +103,10 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotal() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -124,10 +124,10 @@ public function testGetNextWhenSurroundCountIsZero() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -142,10 +142,10 @@ public function testGetNextWhenSurroundCountIsZero() public function testLinksBasics() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $this->uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -153,19 +153,19 @@ public function testLinksBasics() $expected = [ [ - 'uri' => 'http://example.com/foo?page=3', - 'title' => 3, - 'active' => false + 'uri' => 'http://example.com/foo?page=3', + 'title' => 3, + 'active' => false, ], [ - 'uri' => 'http://example.com/foo?page=4', - 'title' => 4, - 'active' => true + 'uri' => 'http://example.com/foo?page=4', + 'title' => 4, + 'active' => true, ], [ - 'uri' => 'http://example.com/foo?page=5', - 'title' => 5, - 'active' => false + 'uri' => 'http://example.com/foo?page=5', + 'title' => 5, + 'active' => false, ], ]; @@ -180,10 +180,10 @@ public function testGetFirstAndGetLast() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, ]; $pager = new PagerRenderer($details); @@ -199,10 +199,10 @@ public function testSurroundCount() $uri = $this->uri; $details = [ - 'uri' => $uri, - 'pageCount' => 10, // 10 pages - 'currentPage' => 4, - 'total' => 100 // 100 records, so 10 per page + 'uri' => $uri, + 'pageCount' => 10, // 10 pages + 'currentPage' => 4, + 'total' => 100,// 100 records, so 10 per page ]; $pager = new PagerRenderer($details); @@ -227,19 +227,16 @@ public function testSurroundCount() $this->assertEquals(null, $pager->getNext()); } - - - //-------------------------------------------------------------------- public function testHasPreviousReturnsFalseWhenFirstIsOneSegment() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 5, - 'currentPage' => 1, - 'total' => 100, - 'segment' => 2, + 'uri' => $this->uri, + 'pageCount' => 5, + 'currentPage' => 1, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -255,11 +252,11 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOneSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 10, - 'currentPage' => 5, - 'total' => 100, - 'segment' => 2 + 'uri' => $uri, + 'pageCount' => 10, + 'currentPage' => 5, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -277,11 +274,11 @@ public function testGetPreviousWhenSurroundCountIsZeroSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2, + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -299,11 +296,11 @@ public function testHasNextReturnsFalseWhenLastIsTotalSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 5, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2, + 'uri' => $uri, + 'pageCount' => 5, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -320,11 +317,11 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotalSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -342,11 +339,11 @@ public function testGetNextWhenSurroundCountIsZeroSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2, + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -361,11 +358,11 @@ public function testGetNextWhenSurroundCountIsZeroSegment() public function testLinksBasicsSegment() { $details = [ - 'uri' => $this->uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2 + 'uri' => $this->uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -373,19 +370,19 @@ public function testLinksBasicsSegment() $expected = [ [ - 'uri' => 'http://example.com/foo/3', - 'title' => 3, - 'active' => false + 'uri' => 'http://example.com/foo/3', + 'title' => 3, + 'active' => false, ], [ - 'uri' => 'http://example.com/foo/4', - 'title' => 4, - 'active' => true + 'uri' => 'http://example.com/foo/4', + 'title' => 4, + 'active' => true, ], [ - 'uri' => 'http://example.com/foo/5', - 'title' => 5, - 'active' => false + 'uri' => 'http://example.com/foo/5', + 'title' => 5, + 'active' => false, ], ]; @@ -400,11 +397,11 @@ public function testGetFirstAndGetLastSegment() $uri->addQuery('foo', 'bar'); $details = [ - 'uri' => $uri, - 'pageCount' => 50, - 'currentPage' => 4, - 'total' => 100, - 'segment' => 2 + 'uri' => $uri, + 'pageCount' => 50, + 'currentPage' => 4, + 'total' => 100, + 'segment' => 2, ]; $pager = new PagerRenderer($details); @@ -413,6 +410,4 @@ public function testGetFirstAndGetLastSegment() $this->assertEquals('http://example.com/foo/50?foo=bar', $pager->getLast()); } - - } diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php index 4c9a505fbd5d..37f43103fb6e 100644 --- a/tests/system/Pager/PagerTest.php +++ b/tests/system/Pager/PagerTest.php @@ -216,7 +216,7 @@ public function testGetNextURIWithQueryStringUsesCurrentURI() $expected = current_url(true); $expected = (string)$expected->setQueryArray($_GET); - $this->pager->store('foo', $_GET['page']-1, 12, 70); + $this->pager->store('foo', $_GET['page'] - 1, 12, 70); $this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo')); } @@ -230,7 +230,7 @@ public function testGetPreviousURIWithQueryStringUsesCurrentURI() $expected = current_url(true); $expected = (string)$expected->setQueryArray($_GET); - $this->pager->store('foo', $_GET['page']+1, 12, 70); + $this->pager->store('foo', $_GET['page'] + 1, 12, 70); $this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo')); } @@ -244,7 +244,10 @@ public function testGetOnlyQueries() 'hello' => 'xxx', 'category' => 'baz', ]; - $onlyQueries = ['search', 'order']; + $onlyQueries = [ + 'search', + 'order', + ]; $this->pager->store('default', $_GET['page'], 10, 100); @@ -252,15 +255,15 @@ public function testGetOnlyQueries() $this->assertEquals( $this->pager->only($onlyQueries) - ->getPreviousPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=1') + ->getPreviousPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=1') ); $this->assertEquals( $this->pager->only($onlyQueries) - ->getNextPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=3') + ->getNextPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=3') ); $this->assertEquals( $this->pager->only($onlyQueries) - ->getPageURI(4), (string)$uri->setQuery('search=foo&order=asc&page=4') + ->getPageURI(4), (string)$uri->setQuery('search=foo&order=asc&page=4') ); } @@ -270,7 +273,6 @@ public function testBadTemplate() $this->pager->links('default', 'bogus'); } - // the tests below are looking for specific
- elements.
// not the most rigorous, but a start :-/
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index f82824276cfb..9eff46dc8c79 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -14,15 +14,15 @@ public function tearDown()
//--------------------------------------------------------------------
- protected function getCollector(array $config=[], array $files=[], $moduleConfig = null)
+ protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
{
$defaults = [
- 'Config' => APPPATH.'Config',
- 'App' => APPPATH,
+ 'Config' => APPPATH . 'Config',
+ 'App' => APPPATH,
];
$config = array_merge($config, $defaults);
- $autoload = new \Config\Autoload();
+ $autoload = new \Config\Autoload();
$autoload->psr4 = $config;
$loader = new MockFileLocator($autoload);
@@ -30,7 +30,7 @@ protected function getCollector(array $config=[], array $files=[], $moduleConfig
if ($moduleConfig === null)
{
- $moduleConfig = new \Config\Modules();
+ $moduleConfig = new \Config\Modules();
$moduleConfig->enabled = false;
}
@@ -107,22 +107,22 @@ public function testAddWorksWithCurrentHTTPMethods()
//--------------------------------------------------------------------
- public function testAddWithLeadingSlash()
- {
- $routes = $this->getCollector();
+ public function testAddWithLeadingSlash()
+ {
+ $routes = $this->getCollector();
- $routes->add('/home', 'controller');
+ $routes->add('/home', 'controller');
- $expects = [
- 'home' => '\controller',
- ];
+ $expects = [
+ 'home' => '\controller',
+ ];
- $routes = $routes->getRoutes();
+ $routes = $routes->getRoutes();
- $this->assertEquals($expects, $routes);
- }
+ $this->assertEquals($expects, $routes);
+ }
- //--------------------------------------------------------------------
+ //--------------------------------------------------------------------
public function testMatchIgnoresInvalidHTTPMethods()
{
@@ -255,13 +255,12 @@ public function testGroupingWorks()
{
$routes = $this->getCollector();
- $routes->group('admin', function($routes)
- {
+ $routes->group('admin', function ($routes) {
$routes->add('users/list', '\Users::list');
});
$expected = [
- 'admin/users/list' => '\Users::list'
+ 'admin/users/list' => '\Users::list',
];
$this->assertEquals($expected, $routes->getRoutes());
@@ -273,13 +272,12 @@ public function testGroupGetsSanitized()
{
$routes = $this->getCollector();
- $routes->group(''
+ 'that_thing' => '',
];
$template = '{ that_thing|esc }';
@@ -368,7 +422,7 @@ public function testFilterWithArgument()
$date = time();
$data = [
- 'my_date' => $date
+ 'my_date' => $date,
];
$template = '{ my_date| date(Y-m-d ) }';
@@ -384,13 +438,13 @@ public function testParserEscapesDataDefaultsToHTML()
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
$data = [
- 'title' => '',
+ 'title' => '',
'powers' => [
['link' => "Link"],
],
];
- $template = "{title} {powers}{link}{/powers}";
+ $template = '{title} {powers}{link}{/powers}';
$parser->setData($data);
$this->assertEquals('<script>Heroes</script> <a href='test'>Link</a>', $parser->renderString($template));
}
@@ -403,7 +457,7 @@ public function testParserNoEscape()
'title' => '',
];
- $template = "{! title!}";
+ $template = '{! title!}';
$parser->setData($data);
$this->assertEquals('', $parser->renderString($template));
}
@@ -413,15 +467,18 @@ public function testParserNoEscape()
public function testIgnoresComments()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
- 'title' => 'Super Heroes',
+ $data = [
+ 'title' => 'Super Heroes',
'powers' => [
- ['invisibility' => 'yes', 'flying' => 'no'],
+ [
+ 'invisibility' => 'yes',
+ 'flying' => 'no',
+ ],
],
];
$template = "{# Comments #}{title}\n{powers}{invisibility}\n{flying}";
- $result = "Super Heroes\n{powers}{invisibility}\n{flying}";
+ $result = "Super Heroes\n{powers}{invisibility}\n{flying}";
$parser->setData($data);
$this->assertEquals($result, $parser->renderString($template));
@@ -432,15 +489,18 @@ public function testIgnoresComments()
public function testNoParse()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
- 'title' => 'Super Heroes',
+ $data = [
+ 'title' => 'Super Heroes',
'powers' => [
- ['invisibility' => 'yes', 'flying' => 'no'],
+ [
+ 'invisibility' => 'yes',
+ 'flying' => 'no',
+ ],
],
];
$template = "{noparse}{title}\n{powers}{invisibility}\n{flying}{/noparse}";
- $result = "{title}\n{powers}{invisibility}\n{flying}";
+ $result = "{title}\n{powers}{invisibility}\n{flying}";
$parser->setData($data);
$this->assertEquals($result, $parser->renderString($template));
@@ -451,12 +511,12 @@ public function testNoParse()
public function testIfConditionalTrue()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
- 'doit' => true,
- 'dontdoit' => false
+ $data = [
+ 'doit' => true,
+ 'dontdoit' => false,
];
- $template = "{if \$doit}Howdy{endif}{ if \$dontdoit === false}Welcome{ endif }";
+ $template = '{if $doit}Howdy{endif}{ if $dontdoit === false}Welcome{ endif }';
$parser->setData($data);
$this->assertEquals('HowdyWelcome', $parser->renderString($template));
@@ -465,11 +525,11 @@ public function testIfConditionalTrue()
public function testElseConditionalFalse()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
+ $data = [
'doit' => true,
];
- $template = "{if \$doit}Howdy{else}Welcome{ endif }";
+ $template = '{if $doit}Howdy{else}Welcome{ endif }';
$parser->setData($data);
$this->assertEquals('Howdy', $parser->renderString($template));
@@ -478,11 +538,11 @@ public function testElseConditionalFalse()
public function testElseConditionalTrue()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
+ $data = [
'doit' => false,
];
- $template = "{if \$doit}Howdy{else}Welcome{ endif }";
+ $template = '{if $doit}Howdy{else}Welcome{ endif }';
$parser->setData($data);
$this->assertEquals('Welcome', $parser->renderString($template));
@@ -491,12 +551,12 @@ public function testElseConditionalTrue()
public function testElseifConditionalTrue()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
- 'doit' => false,
- 'dontdoit' => true
+ $data = [
+ 'doit' => false,
+ 'dontdoit' => true,
];
- $template = "{if \$doit}Howdy{elseif \$dontdoit}Welcome{ endif }";
+ $template = '{if $doit}Howdy{elseif $dontdoit}Welcome{ endif }';
$parser->setData($data);
$this->assertEquals('Welcome', $parser->renderString($template));
@@ -508,13 +568,13 @@ public function testConditionalBadSyntax()
{
$this->expectException(ViewException::class);
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
- 'doit' => true,
- 'dontdoit' => false
+ $data = [
+ 'doit' => true,
+ 'dontdoit' => false,
];
// the template is purposefully malformed
- $template = "{if doit}Howdy{elseif doit}Welcome{ endif )}";
+ $template = '{if doit}Howdy{elseif doit}Welcome{ endif )}';
$parser->setData($data);
$this->assertEquals('HowdyWelcome', $parser->renderString($template));
@@ -535,9 +595,9 @@ public function testWontParsePHP()
public function testParseHandlesSpaces()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
- 'title' => 'Page Title',
- 'body' => 'Lorem ipsum dolor sit amet.',
+ $data = [
+ 'title' => 'Page Title',
+ 'body' => 'Lorem ipsum dolor sit amet.',
];
$template = "{ title}\n{ body }";
@@ -553,9 +613,9 @@ public function testParseHandlesSpaces()
public function testParseRuns()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
- 'title' => 'Page Title',
- 'body' => 'Lorem ipsum dolor sit amet.',
+ $data = [
+ 'title' => 'Page Title',
+ 'body' => 'Lorem ipsum dolor sit amet.',
];
$template = "{ title}\n{ body }";
@@ -574,7 +634,7 @@ public function testParseRuns()
public function testCanAddAndRemovePlugins()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $parser->addPlugin('first', function($str) {
+ $parser->addPlugin('first', function ($str) {
return $str;
});
@@ -598,9 +658,9 @@ public function testParserPluginNoMatches()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $template = "hit:it";
+ $template = 'hit:it';
- $this->assertEquals("hit:it", $parser->renderString($template));
+ $this->assertEquals('hit:it', $parser->renderString($template));
}
//--------------------------------------------------------------------
@@ -611,13 +671,13 @@ public function testParserPluginNoMatches()
public function testParserPluginNoParams()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $parser->addPlugin('hit:it', function($str) {
- return str_replace('here', "Hip to the Hop", $str);
+ $parser->addPlugin('hit:it', function ($str) {
+ return str_replace('here', 'Hip to the Hop', $str);
}, true);
- $template = "{+ hit:it +} stuff here {+ /hit:it +}";
+ $template = '{+ hit:it +} stuff here {+ /hit:it +}';
- $this->assertEquals(" stuff Hip to the Hop ", $parser->renderString($template));
+ $this->assertEquals(' stuff Hip to the Hop ', $parser->renderString($template));
}
//--------------------------------------------------------------------
@@ -628,23 +688,23 @@ public function testParserPluginNoParams()
public function testParserPluginParams()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $parser->addPlugin('growth', function($str, array $params) {
- $step = $params['step'] ?? 1;
+ $parser->addPlugin('growth', function ($str, array $params) {
+ $step = $params['step'] ?? 1;
$count = $params['count'] ?? 2;
$out = '';
- for ($i = 1; $i <= $count; $i ++ )
+ for ($i = 1; $i <= $count; $i ++)
{
- $out .= " " . $i * $step;
+ $out .= ' ' . $i * $step;
}
return $out;
}, true);
- $template = "{+ growth step=2 count=4 +} {+ /growth +}";
+ $template = '{+ growth step=2 count=4 +} {+ /growth +}';
- $this->assertEquals(" 2 4 6 8", $parser->renderString($template));
+ $this->assertEquals(' 2 4 6 8', $parser->renderString($template));
}
//--------------------------------------------------------------------
@@ -655,13 +715,13 @@ public function testParserPluginParams()
public function testParserSingleTag()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $parser->addPlugin('hit:it', function() {
- return "Hip to the Hop";
+ $parser->addPlugin('hit:it', function () {
+ return 'Hip to the Hop';
}, false);
- $template = "{+ hit:it +}";
+ $template = '{+ hit:it +}';
- $this->assertEquals("Hip to the Hop", $parser->renderString($template));
+ $this->assertEquals('Hip to the Hop', $parser->renderString($template));
}
/**
@@ -670,13 +730,13 @@ public function testParserSingleTag()
public function testParserSingleTagWithParams()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $parser->addPlugin('hit:it', function(array $params = []) {
+ $parser->addPlugin('hit:it', function (array $params = []) {
return "{$params['first']} to the {$params['last']}";
}, false);
- $template = "{+ hit:it first=foo last=bar +}";
+ $template = '{+ hit:it first=foo last=bar +}';
- $this->assertEquals("foo to the bar", $parser->renderString($template));
+ $this->assertEquals('foo to the bar', $parser->renderString($template));
}
/**
@@ -685,13 +745,13 @@ public function testParserSingleTagWithParams()
public function testParserSingleTagWithSingleParams()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $parser->addPlugin('hit:it', function(array $params = []) {
+ $parser->addPlugin('hit:it', function (array $params = []) {
return "{$params[0]} to the {$params[1]}";
}, false);
- $template = "{+ hit:it foo bar +}";
+ $template = '{+ hit:it foo bar +}';
- $this->assertEquals("foo to the bar", $parser->renderString($template));
+ $this->assertEquals('foo to the bar', $parser->renderString($template));
}
/**
@@ -700,7 +760,7 @@ public function testParserSingleTagWithSingleParams()
public function testParserSingleTagWithQuotedParams()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $parser->addPlugin('count', function(array $params = []) {
+ $parser->addPlugin('count', function (array $params = []) {
$out = '';
foreach ($params as $index => $param)
@@ -724,16 +784,16 @@ public function testParserSingleTagWithQuotedParams()
public function testParseLoopWithDollarSign()
{
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
- $data = [
+ $data = [
'books' => [
['price' => '12.50'],
],
];
- $template = "{books}
Price $: {price}
{/books}"; + $template = '{books}Price $: {price}
{/books}'; $parser->setData($data); - $this->assertEquals("Price $: 12.50
", $parser->renderString($template)); + $this->assertEquals('Price $: 12.50
', $parser->renderString($template)); } //-------------------------------------------------------------------- @@ -767,7 +827,7 @@ public function testRenderCantFindView() $parser->setData(['testString' => 'Hello World']); $expected = '