Skip to content

Commit bba3deb

Browse files
oliverkleeSam Tuke
authored and
Sam Tuke
committed
[TASK] Use the new database schema location (#102)
Also update the core package name in the documentation.
1 parent 43df997 commit bba3deb

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ named `phplist`, and the password is `batterystaple`, the command looks like
9393
this:
9494

9595
```bash
96-
mysql -u phplist_test --password=batterystaple phplist_test < vendor/phplist/phplist4-core/Database/Schema.sql
96+
mysql -u phplist_test --password=batterystaple phplist_test < vendor/phplist/core/resources/Database/Schema.sql
9797
```
9898

9999
When running the integration tests, you will need to specify the database name
@@ -116,13 +116,13 @@ We will only merge pull requests that follow the project's coding style.
116116
Please check your code with the provided PHP_CodeSniffer standard:
117117

118118
```bash
119-
vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ src/ tests/
119+
vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/
120120
```
121121

122122
Please also check the code structure using PHPMD:
123123

124124
```bash
125-
vendor/bin/phpmd src/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml
125+
vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml
126126
```
127127

128128
And also please run the static code analysis:
@@ -134,7 +134,7 @@ vendor/bin/phpstan analyse -l 5 src/ tests/
134134
You can also run all code style checks using one long line from a bash shell:
135135

136136
```bash
137-
find src/ tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && vendor/bin/phpstan analyse -l 5 src/ tests/ && vendor/bin/phpmd src/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml && vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ src/ tests/
137+
find src/ tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && vendor/bin/phpstan analyse -l 5 src/ tests/ && vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml && vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/
138138
```
139139

140140
This will execute all tests except for the unit tests and the integration

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ before_script:
5050
echo "Creating the database and importing the database schema";
5151
mysql -e "CREATE DATABASE ${PHPLIST_DATABASE_NAME};";
5252
mysql -u root -e "GRANT ALL ON ${PHPLIST_DATABASE_NAME}.* TO '${PHPLIST_DATABASE_USER}'@'%';";
53-
mysql ${PHPLIST_DATABASE_NAME} < vendor/phplist/core/Database/Schema.sql;
53+
mysql ${PHPLIST_DATABASE_NAME} < vendor/phplist/core/resources/Database/Schema.sql;
5454
5555
script:
5656
- >

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
1616
### Changed
1717
- Move the PHPUnit configuration file (#99)
1818
- Use the renamed phplist/core package (#97)
19-
- Adopt more of the default Symfony project structure (#92, #93, #94, #95)
19+
- Adopt more of the default Symfony project structure (#92, #93, #94, #95, #102)
2020

2121
### Deprecated
2222

0 commit comments

Comments
 (0)