Skip to content

Commit 957768c

Browse files
committed
Simplify package naming
1 parent 6c29e40 commit 957768c

97 files changed

Lines changed: 36 additions & 36 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/mysql-proxy-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
with:
2727
ignore-cache: "yes"
2828
composer-options: "--optimize-autoloader"
29-
working-directory: packages/wp-mysql-proxy
29+
working-directory: packages/mysql-proxy
3030

3131
- name: Run MySQL Proxy tests
3232
run: composer run test
33-
working-directory: packages/wp-mysql-proxy
33+
working-directory: packages/mysql-proxy

.github/workflows/phpunit-tests-run.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ jobs:
7878
ignore-cache: "yes"
7979
composer-options: "--optimize-autoloader"
8080

81-
- name: Install Composer dependencies (wp-mysql-on-sqlite)
81+
- name: Install Composer dependencies (mysql-on-sqlite)
8282
uses: ramsey/composer-install@v3
8383
with:
84-
working-directory: packages/wp-mysql-on-sqlite
84+
working-directory: packages/mysql-on-sqlite
8585
ignore-cache: "yes"
8686
composer-options: "--optimize-autoloader"
8787

8888
- name: Run PHPUnit tests
8989
run: php ./vendor/bin/phpunit -c ./phpunit.xml.dist
90-
working-directory: packages/wp-mysql-on-sqlite
90+
working-directory: packages/mysql-on-sqlite
9191

9292
- name: Run PHPUnit tests for the legacy driver
9393
run: php ./vendor/bin/phpunit -c ./phpunit.xml.dist

.github/workflows/release-prepare.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ jobs:
5252
run: |
5353
# Update version.php
5454
sed -i "s/define( 'SQLITE_DRIVER_VERSION', '.*' );/define( 'SQLITE_DRIVER_VERSION', '$VERSION' );/" \
55-
packages/wp-mysql-on-sqlite/src/version.php
55+
packages/mysql-on-sqlite/src/version.php
5656
5757
# Update plugin header
5858
sed -i "s/^\( \* Version:\).*/\1 $VERSION/" \
59-
packages/sqlite-database-integration/load.php
59+
packages/plugin-sqlite-database-integration/load.php
6060
6161
# Update readme.txt stable tag
6262
sed -i "s/^Stable tag:.*/Stable tag: $VERSION/" \
63-
packages/sqlite-database-integration/readme.txt
63+
packages/plugin-sqlite-database-integration/readme.txt
6464
6565
- name: Update changelog in readme.txt
6666
env:
6767
VERSION: ${{ steps.release_info.outputs.version }}
6868
CHANGELOG: ${{ steps.release_info.outputs.changelog }}
6969
run: |
70-
README="packages/sqlite-database-integration/readme.txt"
70+
README="packages/plugin-sqlite-database-integration/readme.txt"
7171
7272
# Build the new changelog entry.
7373
ENTRY=$(printf "= %s =\n\n%s\n" "$VERSION" "$CHANGELOG")

.github/workflows/verify-version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
- name: Extract version from "load.php"
1717
id: load_version
1818
run: |
19-
VERSION=$(grep "Version:" packages/sqlite-database-integration/load.php | sed "s/.*Version: \([^ ]*\).*/\1/")
19+
VERSION=$(grep "Version:" packages/plugin-sqlite-database-integration/load.php | sed "s/.*Version: \([^ ]*\).*/\1/")
2020
echo "load_version=$VERSION" >> $GITHUB_OUTPUT
2121
2222
- name: Extract version from "version.php"
2323
id: const_version
2424
run: |
25-
VERSION=$(php -r "require 'packages/wp-mysql-on-sqlite/src/version.php'; echo SQLITE_DRIVER_VERSION;")
25+
VERSION=$(php -r "require 'packages/mysql-on-sqlite/src/version.php'; echo SQLITE_DRIVER_VERSION;")
2626
echo "const_version=$VERSION" >> $GITHUB_OUTPUT
2727
2828
- name: Compare versions

bin/build-plugin-zip.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ rm -f "$ZIP_FILE"
2020
mkdir -p "$BUILD_DIR"
2121

2222
# Copy the plugin package.
23-
cp -R "$DIR/packages/sqlite-database-integration" "$PLUGIN_DIR"
23+
cp -R "$DIR/packages/plugin-sqlite-database-integration" "$PLUGIN_DIR"
2424

2525
# Resolve the database symlink — replace it with a real copy of the driver.
2626
rm "$PLUGIN_DIR/wp-includes/database"
27-
cp -R "$DIR/packages/wp-mysql-on-sqlite/src" "$PLUGIN_DIR/wp-includes/database"
27+
cp -R "$DIR/packages/mysql-on-sqlite/src" "$PLUGIN_DIR/wp-includes/database"
2828

2929
# Remove dev-only files.
3030
rm -rf "$PLUGIN_DIR/composer.json"

grammar-tools/convert-grammar.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* @TODO Migrate the current regex-based solution to a proper grammar parser.
1111
*/
1212

13-
require_once __DIR__ . '/../packages/wp-mysql-on-sqlite/src/parser/class-wp-parser-grammar.php';
14-
require_once __DIR__ . '/../packages/wp-mysql-on-sqlite/src/mysql/class-wp-mysql-lexer.php';
13+
require_once __DIR__ . '/../packages/mysql-on-sqlite/src/parser/class-wp-parser-grammar.php';
14+
require_once __DIR__ . '/../packages/mysql-on-sqlite/src/mysql/class-wp-mysql-lexer.php';
1515

16-
const GRAMMAR_FILE = __DIR__ . '/../packages/wp-mysql-on-sqlite/src/mysql/mysql-grammar.php';
16+
const GRAMMAR_FILE = __DIR__ . '/../packages/mysql-on-sqlite/src/mysql/mysql-grammar.php';
1717

1818
// Convert the original MySQLParser.g4 grammar to a JSON format.
1919
// The grammar is also flattened and expanded to an ebnf-to-json-like format.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "wordpress/wp-mysql-on-sqlite",
2+
"name": "wordpress/mysql-on-sqlite",
33
"type": "library",
44
"scripts": {
55
"test": "phpunit"
File renamed without changes.

packages/wp-mysql-on-sqlite/src/mysql/class-wp-mysql-lexer.php renamed to packages/mysql-on-sqlite/src/mysql/class-wp-mysql-lexer.php

File renamed without changes.

0 commit comments

Comments
 (0)