Skip to content

Commit 074bc78

Browse files
committed
Fix missed application/ folder references
1 parent 82984a7 commit 074bc78

13 files changed

Lines changed: 16 additions & 16 deletions

File tree

contributing/internals.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Configuration
8888
=============
8989

9090
Should the package require user-configurable settings, you should create a new file just for that package under
91-
**application/Config**. The file name should generally match the package name.
91+
**app/Config**. The file name should generally match the package name.
9292

9393
Autoloader
9494
==========

system/Autoloader/Autoloader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ protected function loadInNamespace(string $class)
310310

311311
/**
312312
* Attempts to load the class from common locations in previous
313-
* version of CodeIgniter, namely 'application/libraries', and
314-
* 'application/Models'.
313+
* version of CodeIgniter, namely 'app/Libraries', and
314+
* 'app/Models'.
315315
*
316316
* @param string $class The class name. This typically should NOT have a namespace.
317317
*

system/Autoloader/FileLocator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ public function getClassname(string $file) : string
202202
* $locator->search('Config/Routes.php');
203203
* // Assuming PSR4 namespaces include foo and bar, might return:
204204
* [
205-
* 'application/modules/foo/Config/Routes.php',
206-
* 'application/modules/bar/Config/Routes.php',
205+
* 'app/Modules/foo/Config/Routes.php',
206+
* 'app/Modules/bar/Config/Routes.php',
207207
* ]
208208
*
209209
* @param string $path

system/Common.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ function remove_invisible_characters($str, $url_encoded = true)
569569
* both in and out of the 'helpers' directory of a namespaced directory.
570570
*
571571
* Will load ALL helpers of the matching name, in the following order:
572-
* 1. application/Helpers
572+
* 1. app/Helpers
573573
* 2. {namespace}/Helpers
574574
* 3. system/Helpers
575575
*

system/Log/Logger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ public function determineFile()
511511
* Cleans the paths of filenames by replacing APPPATH, SYSTEMPATH, FCPATH
512512
* with the actual var. i.e.
513513
*
514-
* /var/www/site/application/Controllers/Home.php
514+
* /var/www/site/app/Controllers/Home.php
515515
* becomes:
516516
* APPPATH/Controllers/Home.php
517517
*

system/Router/RouteCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ protected function create(string $verb, string $from, $to, array $options = null
13081308
$name = $options['as'] ?? $from;
13091309

13101310
// Don't overwrite any existing 'froms' so that auto-discovered routes
1311-
// do not overwrite any application/Config/Routes settings. The app
1311+
// do not overwrite any app/Config/Routes settings. The app
13121312
// routes should always be the "source of truth".
13131313
// this works only because discovered routes are added just prior
13141314
// to attempting to route the request.

system/Session/Session.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* Implementation of CodeIgniter session container.
4343
*
4444
* Session configuration is done through session variables and cookie related
45-
* variables in application/config/App.php
45+
* variables in app/config/App.php
4646
*/
4747
class Session implements SessionInterface
4848
{

tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If running under OS X or Linux, you will want to create a symbolic link to make
1414

1515
## Setup
1616

17-
A number of the tests that are ran during the test suite are ran against a running database. In order to setup the database used here, edit the details for the `tests` database group in **application/Config/Database.php**. Make sure that you provide a database engine that is currently running, and have already created a table that you can use only for these tests, as it will be wiped and refreshed often while running the test suite.
17+
A number of the tests that are ran during the test suite are ran against a running database. In order to setup the database used here, edit the details for the `tests` database group in **app/Config/Database.php**. Make sure that you provide a database engine that is currently running, and have already created a table that you can use only for these tests, as it will be wiped and refreshed often while running the test suite.
1818

1919
If you want to run the tests without running the live database tests, you can exclude @DatabaseLive group. Or make a copy of **phpunit.dist.xml**, call it **phpunit.xml**, and un-comment the line within the testsuite that excludes the **tests/system/Database/Live** directory. This will make the tests run quite a bit faster.
2020

user_guide_src/source/changelogs/v4.0.0-alpha.3.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ PRs merged:
307307
- #1460 remove unneeded ternary check at HoneyPot
308308
- #1457 use $paths->systemDirectory in public/index.php
309309
- #1456 Beef up HTTP URI & Response testing
310-
- #1455 un-ignore application/Database/Migrations directory
310+
- #1455 un-ignore app/Database/Migrations directory
311311
- #1454 add missing break; in loop at Email::getEncoding()
312312
- #1453 BugFix if there extension has only one mime type
313313
- #1451 remove unneeded $session->start(); check on RedirectResponse
@@ -318,7 +318,7 @@ PRs merged:
318318
- #1445 using existing is_cli() function in HTTP\IncomingRequest
319319
- #1444 Dox for reorganized repo admin (4 of 4)
320320
- #1443 Fixes unit test output not captured
321-
- #1442 remove form view in application/View/ and form helper usage in create new items tutorial
321+
- #1442 remove form view in app/View/ and form helper usage in create new items tutorial
322322
- #1440 Access to model's last inserted ID
323323
- #1438 Tailor the last few repo org names (3 of 4)
324324
- #1437 Replace repo org name in MOST php docs (2 of 4)

user_guide_src/source/helpers/text_helper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ The following functions are available:
263263
$string = convert_accented_characters($string);
264264

265265
.. note:: This function uses a companion config file
266-
`application/Config/ForeignCharacters.php` to define the to and
266+
`app/Config/ForeignCharacters.php` to define the to and
267267
from array for transliteration.
268268

269269
.. php:function:: word_censor($str, $censored[, $replacement = ''])

0 commit comments

Comments
 (0)