Skip to content

Commit d1a29d4

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18667 from MauricioFauth/skeleton
Rename the directory `libraries/classes/` to `src/`
2 parents bb2869b + 1ddcad2 commit d1a29d4

717 files changed

Lines changed: 4501 additions & 4493 deletions

File tree

Some content is hidden

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

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
php\$V-dom php\$V-json php\$V-bz2 php\$V-curl php\$V-gd php\$V-zip \
4646
musl-locales musl-locales-lang \
4747
gettext composer git && \
48-
composer config version "$(php -r "define('VERSION_SUFFIX', ''); require_once('libraries/classes/Version.php'); echo \PhpMyAdmin\Version::VERSION;")" && \
48+
composer config version "$(php -r "define('VERSION_SUFFIX', ''); require_once('src/Version.php'); echo \PhpMyAdmin\Version::VERSION;")" && \
4949
composer update && \
5050
./scripts/generate-mo && \
5151
php\$V -d memory_limit=512M ./vendor/bin/phpunit --no-logging --no-coverage --testsuite unit --exclude-group=%s" \

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"non-feature-branches": ["RELEASE_.*"],
2323
"autoload": {
2424
"psr-4": {
25-
"PhpMyAdmin\\": "libraries/classes"
25+
"PhpMyAdmin\\": "src"
2626
},
2727
"files": ["vendor/phpmyadmin/motranslator/src/functions.php"],
2828
"exclude-from-classmap": [

‎doc/config.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3615,7 +3615,7 @@ Various display setting
36153615

36163616
Contains names of configuration options (keys in ``$cfg`` array) that
36173617
users can't set through user preferences. For possible values, refer
3618-
to classes under :file:`libraries/classes/Config/Forms/User/`.
3618+
to classes under :file:`src/Config/Forms/User/`.
36193619

36203620
.. config:option:: $cfg['UserprefsDeveloperTab']
36213621

‎doc/faq.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Please use instead the cookie authentication mode.
6363

6464
This seems to be a PWS bug. Filippo Simoncini found a workaround (at
6565
this time there is no better fix): remove or comment the ``DOCTYPE``
66-
declarations (2 lines) from the scripts :file:`libraries/classes/Header.php`
66+
declarations (2 lines) from the scripts :file:`src/Header.php`
6767
and :file:`index.php`.
6868

6969
.. _faq1_7:

‎doc/transformations.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ File structure
103103
++++++++++++++
104104

105105
All specific transformations for mimetypes are defined through class
106-
files in the directory :file:`libraries/classes/Plugins/Transformations/`. Each of
106+
files in the directory :file:`src/Plugins/Transformations/`. Each of
107107
them extends a certain transformation abstract class declared in
108-
:file:`libraries/classes/Plugins/Transformations/Abs`.
108+
:file:`src/Plugins/Transformations/Abs`.
109109

110110
They are stored in files to ease customization and to allow easy adding of
111111
new or custom transformations.
@@ -115,7 +115,7 @@ the transformations will always work. It makes no sense to apply a
115115
transformation to a mimetype the transform-function doesn't know to
116116
handle.
117117

118-
There is a file called :file:`libraries/classes/Plugins/Transformations.php` that provides some
118+
There is a file called :file:`src/Plugins/Transformations.php` that provides some
119119
basic functions which can be included by any other transform function.
120120

121121
The file name convention is ``[Mimetype]_[Subtype]_[Transformation
@@ -133,8 +133,8 @@ getInfo() returns the transformation's description and possible
133133
options it may receive and applyTransformation() is the method that
134134
does the actual work of the transformation plug-in.
135135

136-
Please see the :file:`libraries/classes/Plugins/Transformations/TEMPLATE` and
137-
:file:`libraries/classes/Plugins/Transformations/TEMPLATE\_ABSTRACT` files for adding
136+
Please see the :file:`src/Plugins/Transformations/TEMPLATE` and
137+
:file:`src/Plugins/Transformations/TEMPLATE\_ABSTRACT` files for adding
138138
your own transformation plug-in. You can also generate a new
139139
transformation plug-in (with or without the abstract transformation
140140
class), by using

‎phpcs.xml.dist‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<file>./libraries</file>
1212
<file>./public</file>
1313
<file>./scripts</file>
14+
<file>./src</file>
1415
<file>./test</file>
1516
<file>./config.sample.inc.php</file>
1617

@@ -35,7 +36,7 @@
3536
</rule>
3637

3738
<rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
38-
<exclude-pattern>*/libraries/classes/Plugins/Transformations/*</exclude-pattern>
39+
<exclude-pattern>*/src/Plugins/Transformations/*</exclude-pattern>
3940
</rule>
4041

4142
<!-- Rules that should be followed, but are not required -->

0 commit comments

Comments
 (0)