Skip to content

Commit 07d1e4c

Browse files
committed
Move third-party software to system/ThirdParty. Updated ComposerScripts file. Tweaked common folders in application.
1 parent 05ddb17 commit 07d1e4c

49 files changed

Lines changed: 17 additions & 20 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

application/Models/.gitkeep

Whitespace-only changes.

application/Models/TrackModel.php

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

application/ThirdParty/.gitkeep

Whitespace-only changes.

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
"phpdocumentor/phpdocumentor": "^2.9"
2525
},
2626
"scripts": {
27-
"post-update-cmd": "CodeIgniter\\ComposerScripts::postUpdate"
27+
"post-update-cmd": [
28+
"composer dump-autoload",
29+
"CodeIgniter\\ComposerScripts::postUpdate"
30+
]
2831
}
2932
}

public/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
*/
172172
if ($useKint === true)
173173
{
174-
require_once BASEPATH.'Debug/Kint/Kint.class.php';
174+
require_once BASEPATH.'ThirdParty/Kint/Kint.class.php';
175175
}
176176

177177
/*

system/ComposerScripts.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,21 @@ public static function postUpdate()
6161
*/
6262
if (class_exists('\\Zend\\Escaper\\Escaper') && file_exists(self::getClassFilePath('\\Zend\\Escaper\\Escaper')))
6363
{
64-
if (! is_dir('system/View/Exception'))
64+
$base = 'system/ThirdParty/ZendEscaper';
65+
66+
foreach ([$base, $base.'/Exception'] as $path)
6567
{
66-
mkdir('system/View/Exception', 0755);
68+
if (! is_dir($path))
69+
{
70+
mkdir($path, 0755);
71+
}
6772
}
6873

6974
$files = [
70-
self::getClassFilePath('\\Zend\\Escaper\\Exception\\ExceptionInterface') => './system/View/Exception/ExceptionInterface.php',
71-
self::getClassFilePath('\\Zend\\Escaper\\Exception\\InvalidArgumentException') => 'system/View/Exception/InvalidArgumentException.php',
72-
self::getClassFilePath('\\Zend\\Escaper\\Exception\\RuntimeException') => 'system/View/Exception/RuntimeException.php',
73-
self::getClassFilePath('\\Zend\\Escaper\\Escaper')=> 'system/View/Escaper.php'
75+
self::getClassFilePath('\\Zend\\Escaper\\Exception\\ExceptionInterface') => $base.'/Exception/ExceptionInterface.php',
76+
self::getClassFilePath('\\Zend\\Escaper\\Exception\\InvalidArgumentException') => $base.'/Exception/InvalidArgumentException.php',
77+
self::getClassFilePath('\\Zend\\Escaper\\Exception\\RuntimeException') => $base.'/Exception/RuntimeException.php',
78+
self::getClassFilePath('\\Zend\\Escaper\\Escaper') => $base.'/Escaper.php'
7479
];
7580

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

system/Config/AutoloadConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function __construct()
169169
'CodeIgniter\Session\Handlers\RedisHandler' => BASEPATH.'Session/Handlers/RedisHandler.php',
170170
'CodeIgniter\View\RenderableInterface' => BASEPATH.'View/RenderableInterface.php',
171171
'CodeIgniter\View\View' => BASEPATH.'View/View.php',
172-
'Zend\Escaper\Escaper' => BASEPATH.'View/Escaper.php',
172+
'Zend\Escaper\Escaper' => BASEPATH.'ThirdParty/ZendEscaper/Escaper.php',
173173
'CodeIgniter\Log\TestLogger' => BASEPATH.'../tests/_support/Log/TestLogger.php',
174174
'CIDatabaseTestCase' => BASEPATH.'../tests/_support/CIDatabaseTestCase.php'
175175
];

0 commit comments

Comments
 (0)