Skip to content

Commit a1ab2aa

Browse files
authored
Merge pull request #5383 from kenjis/fix-docs-psr
docs: replace `PSR*` with `PSR-*`
2 parents e6fdfdf + dfa5229 commit a1ab2aa

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

user_guide_src/source/concepts/autoloader.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ headache and very error-prone. That's where autoloaders come in.
1111

1212
CodeIgniter provides a very flexible autoloader that can be used with very little configuration.
1313
It can locate individual non-namespaced classes, namespaced classes that adhere to
14-
`PSR4 <https://www.php-fig.org/psr/psr-4/>`_ autoloading
14+
`PSR-4 <https://www.php-fig.org/psr/psr-4/>`_ autoloading
1515
directory structures, and will even attempt to locate classes in common directories (like Controllers,
1616
Models, etc).
1717

@@ -30,7 +30,7 @@ Configuration
3030
=============
3131

3232
Initial configuration is done in **/app/Config/Autoload.php**. This file contains two primary
33-
arrays: one for the classmap, and one for PSR4-compatible namespaces.
33+
arrays: one for the classmap, and one for PSR-4 compatible namespaces.
3434

3535
Namespaces
3636
==========

user_guide_src/source/general/logging.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ Using Third-Party Loggers
136136
=========================
137137

138138
You can use any other logger that you might like as long as it extends from either
139-
``Psr\Log\LoggerInterface`` and is `PSR3 <https://www.php-fig.org/psr/psr-3/>`_ compatible. This means
140-
that you can easily drop in use for any PSR3-compatible logger, or create your own.
139+
``Psr\Log\LoggerInterface`` and is `PSR-3 <https://www.php-fig.org/psr/psr-3/>`_ compatible. This means
140+
that you can easily drop in use for any PSR-3 compatible logger, or create your own.
141141

142142
You must ensure that the third-party logger can be found by the system, by adding it to either
143143
the **app/Config/Autoload.php** configuration file, or through another autoloader,

user_guide_src/source/general/modules.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ language files, etc. Modules may contain as few, or as many, of these as you lik
1515
Namespaces
1616
==========
1717

18-
The core element of the modules functionality comes from the :doc:`PSR4-compatible autoloading </concepts/autoloader>`
19-
that CodeIgniter uses. While any code can use the PSR4 autoloader and namespaces, the primary way to take full advantage of
18+
The core element of the modules functionality comes from the :doc:`PSR-4 compatible autoloading </concepts/autoloader>`
19+
that CodeIgniter uses. While any code can use the PSR-4 autoloader and namespaces, the primary way to take full advantage of
2020
modules is to namespace your code and add it to **app/Config/Autoload.php**, in the ``psr4`` section.
2121

2222
For example, let's say we want to keep a simple blog module that we can re-use between applications. We might create
@@ -129,7 +129,7 @@ Discovery and Composer
129129
======================
130130

131131
Packages that were installed via Composer will also be discovered by default. This only requires that the namespace
132-
that Composer knows about is a PSR4 namespace. PSR0 namespaces will not be detected.
132+
that Composer knows about is a PSR-4 namespace. PSR-0 namespaces will not be detected.
133133

134134
If you do not want all of Composer's known directories to be scanned when locating files, you can turn this off
135135
by editing the ``$discoverInComposer`` variable in ``Config\Modules.php``::

user_guide_src/source/installation/upgrade_4xx.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ General Adjustments
7777
references magically injected as properties of your controller.
7878
- Classes are instantiated where needed, and components are managed
7979
by ``Services``.
80-
- The class loader automatically handles PSR4 style class locating,
80+
- The class loader automatically handles PSR-4 style class locating,
8181
within the ``App`` (application) and ``CodeIgniter`` (i.e., system) top level
8282
namespaces; with composer autoloading support, and even using educated
8383
guessing to find your models and libraries if they are in the right

0 commit comments

Comments
 (0)