Skip to content

Commit 91db7c3

Browse files
lonnieezelllonnieezell
committed
Transition from Zend Escaper to Laminas Escaper now that they've transitioned to a new open source version of the Zend framework.
1 parent 0d75ea2 commit 91db7c3

15 files changed

Lines changed: 70 additions & 72 deletions

File tree

‎admin/framework/composer.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "codeigniter4/framework",
2+
"name": "codeigniter4/codeigniter4",
33
"type": "project",
44
"description": "The CodeIgniter framework v4",
55
"homepage": "https://codeigniter.com",
@@ -8,9 +8,10 @@
88
"php": ">=7.2",
99
"ext-curl": "*",
1010
"ext-intl": "*",
11+
"ext-json": "*",
1112
"kint-php/kint": "^2.1",
1213
"psr/log": "^1.1",
13-
"zendframework/zend-escaper": "^2.5"
14+
"laminas/laminas-escaper": "^2.6"
1415
},
1516
"require-dev": {
1617
"codeigniter4/codeigniter4-standard": "^1.0",
@@ -26,7 +27,8 @@
2627
"scripts": {
2728
"post-update-cmd": [
2829
"@composer dump-autoload",
29-
"CodeIgniter\\ComposerScripts::postUpdate"
30+
"CodeIgniter\\ComposerScripts::postUpdate",
31+
"bash admin/setup.sh"
3032
]
3133
},
3234
"support": {

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"ext-json": "*",
1212
"kint-php/kint": "^2.1",
1313
"psr/log": "^1.1",
14-
"zendframework/zend-escaper": "^2.5"
14+
"laminas/laminas-escaper": "^2.6"
1515
},
1616
"require-dev": {
1717
"codeigniter4/codeigniter4-standard": "^1.0",

‎system/Common.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
use Config\Logger;
4949
use Config\Services;
5050
use Tests\Support\Log\TestLogger;
51-
use Zend\Escaper\Escaper;
51+
use Laminas\Escaper\Escaper;
5252

5353
/**
5454
* Common Functions

‎system/ComposerScripts.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ protected static function removeDir($dir)
150150
}
151151

152152
/**
153-
* Moves the Zend Escaper files into our base repo so that it's
153+
* Moves the Laminas Escaper files into our base repo so that it's
154154
* available for packaged releases where the users don't user Composer.
155155
*
156156
* @throws \ReflectionException
157157
*/
158158
public static function moveEscaper()
159159
{
160-
if (class_exists('\\Zend\\Escaper\\Escaper') && is_file(static::getClassFilePath('\\Zend\\Escaper\\Escaper')))
160+
if (class_exists('\\Laminas\\Escaper\\Escaper') && is_file(static::getClassFilePath('\\Laminas\\Escaper\\Escaper')))
161161
{
162-
$base = basename(__DIR__) . '/' . static::$basePath . 'ZendEscaper';
162+
$base = basename(__DIR__) . '/' . static::$basePath . 'Escaper';
163163

164164
foreach ([$base, $base . '/Exception'] as $path)
165165
{
@@ -170,10 +170,10 @@ public static function moveEscaper()
170170
}
171171

172172
$files = [
173-
static::getClassFilePath('\\Zend\\Escaper\\Exception\\ExceptionInterface') => $base . '/Exception/ExceptionInterface.php',
174-
static::getClassFilePath('\\Zend\\Escaper\\Exception\\InvalidArgumentException') => $base . '/Exception/InvalidArgumentException.php',
175-
static::getClassFilePath('\\Zend\\Escaper\\Exception\\RuntimeException') => $base . '/Exception/RuntimeException.php',
176-
static::getClassFilePath('\\Zend\\Escaper\\Escaper') => $base . '/Escaper.php',
173+
static::getClassFilePath('\\Laminas\\Escaper\\Exception\\ExceptionInterface') => $base . '/Exception/ExceptionInterface.php',
174+
static::getClassFilePath('\\Laminas\\Escaper\\Exception\\InvalidArgumentException') => $base . '/Exception/InvalidArgumentException.php',
175+
static::getClassFilePath('\\Laminas\\Escaper\\Exception\\RuntimeException') => $base . '/Exception/RuntimeException.php',
176+
static::getClassFilePath('\\Laminas\\Escaper\\Escaper') => $base . '/Escaper.php',
177177
];
178178

179179
foreach ($files as $source => $dest)

‎system/Config/AutoloadConfig.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function __construct()
124124
'Psr\Log\LoggerTrait' => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
125125
'Psr\Log\LogLevel' => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
126126
'Psr\Log\NullLogger' => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
127-
'Zend\Escaper\Escaper' => SYSTEMPATH . 'ThirdParty/ZendEscaper/Escaper.php',
127+
'Laminas\Escaper\Escaper' => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
128128
];
129129

130130
if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')

system/ThirdParty/ZendEscaper/Escaper.php renamed to system/ThirdParty/Escaper/Escaper.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?php
2+
23
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
4+
* @see https://github.com/laminas/laminas-escaper for the canonical source repository
5+
* @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
6+
* @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
87
*/
98

10-
namespace Zend\Escaper;
9+
namespace Laminas\Escaper;
1110

1211
/**
1312
* Context specific methods for use in secure output escaping

‎system/ThirdParty/Escaper/Exception/ExceptionInterface.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
/**
4+
* @see https://github.com/laminas/laminas-escaper for the canonical source repository
5+
* @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
6+
* @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
7+
*/
8+
9+
namespace Laminas\Escaper\Exception;
10+
11+
interface ExceptionInterface
12+
{
13+
}

‎system/ThirdParty/Escaper/Exception/InvalidArgumentException.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
/**
4+
* @see https://github.com/laminas/laminas-escaper for the canonical source repository
5+
* @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
6+
* @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
7+
*/
8+
9+
namespace Laminas\Escaper\Exception;
10+
11+
/**
12+
* Invalid argument exception
13+
*/
14+
class InvalidArgumentException extends \InvalidArgumentException implements
15+
ExceptionInterface
16+
{
17+
}

‎system/ThirdParty/Escaper/Exception/RuntimeException.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
/**
4+
* @see https://github.com/laminas/laminas-escaper for the canonical source repository
5+
* @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
6+
* @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
7+
*/
8+
9+
namespace Laminas\Escaper\Exception;
10+
11+
/**
12+
* Invalid argument exception
13+
*/
14+
class RuntimeException extends \RuntimeException implements
15+
ExceptionInterface
16+
{
17+
}

‎system/ThirdParty/ZendEscaper/Exception/ExceptionInterface.php‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)