Skip to content

Commit 17778bc

Browse files
committed
Enhance CommandRunnerTest
1 parent 2e79e6b commit 17778bc

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

system/Autoloader/FileLocator.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
* Allows loading non-class files in a namespaced manner.
4444
* Works with Helpers, Views, etc.
4545
*
46-
* @todo sanitize filenames prior to checking them...
47-
*
46+
*
4847
* @package CodeIgniter
4948
*/
5049
class FileLocator
@@ -133,7 +132,6 @@ public function locateFile(string $file, string $folder = null, string $ext = 'p
133132
// IF we have a folder name, then the calling function
134133
// expects this file to be within that folder, like 'Views',
135134
// or 'libraries'.
136-
// @todo Allow it to check with and without the nested folder.
137135
if ( ! empty($folder) && strpos($filename, $folder) === false)
138136
{
139137
$filename = $folder . '/' . $filename;

user_guide_src/source/changelog.rst

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public /
2525
- index #1295, #1313
2626

2727
system /
28+
- CLI/
29+
- CommandRunner #1350, #1356
2830
- Commands/
2931
- Server/Serve #1313
3032
- Config/
@@ -65,7 +67,7 @@ system /
6567
- Cast #1283
6668
- HTTP #1239
6769
- Router/
68-
- RouteCollection #1285
70+
- RouteCollection #1285, #1355
6971
- Test/
7072
- FeatureTestCase #1282
7173
- CodeIgniter #1239 #1337
@@ -76,6 +78,8 @@ system /
7678
tests /
7779
- API/
7880
- ResponseTraitTest #1302
81+
- Commands/
82+
- CommandsTest #1356
7983
- Database/
8084
- BaseBuilderTest #1217
8185
- Live/ModelTest #1311
@@ -98,7 +102,7 @@ tests /
98102
- I18n/
99103
- TimeTest #1273, #1316
100104
- Router/
101-
- RouteTest #1285
105+
- RouteTest #1285, #1355
102106
- View/
103107
- ParserTest #1311
104108
- EntityTest #1319
@@ -142,6 +146,9 @@ user_guide_src /source/
142146
PRs merged:
143147
-----------
144148

149+
- #1356 Testing/commands
150+
- #1355 Handle duplicate HTTP verb and generic rules properly
151+
- #1350 Checks if class is instantiable and is a command
145152
- #1348 Fix sphinx formatting in sessions
146153
- #1347 Fix sphinx formatting in sessions
147154
- #1342 Toolbar Styles

0 commit comments

Comments
 (0)