Skip to content

Commit

Permalink
breaking 4.0.0 internal name change
Browse files Browse the repository at this point in the history
  • Loading branch information
7underlines committed Sep 15, 2024
1 parent 1749cae commit 621a79d
Show file tree
Hide file tree
Showing 246 changed files with 1,135 additions and 1,160 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ jobs:
docker logs shop
- name: Upload into Docker
run: |
docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule
docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware
docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R'
- name: Install and Build Plugin
run: |
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make clean'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make clean'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build'
16 changes: 8 additions & 8 deletions .github/workflows/ci_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ jobs:
- name: Upload into Docker
run: |
docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule
docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware
docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R'
- name: Install and Build Plugin
run: |
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make clean'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make clean'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build'
# ------------------------------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -172,18 +172,18 @@ jobs:

# - name: Upload into Docker
# run: |
# docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule
# docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware
# docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R'

# - name: Install and Build Artifacts
# run: |
# docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install -B'
# docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build -B'
# docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install -B'
# docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build -B'

# - name: Install/Configure Plugin
# run: |
# docker exec shop bash -c 'php bin/console plugin:refresh'
# docker exec shop bash -c 'php bin/console plugin:install SasBlogModule --activate'
# docker exec shop bash -c 'php bin/console plugin:install WerklOpenBlogware --activate'
# docker exec shop bash -c 'php bin/console cache:clear'

# - name: Install Cypress
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ jobs:
docker logs shop
- name: Upload into Docker
run: |
docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule
docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware
docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R'
- name: Install and Build Plugin
run: |
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make clean'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make clean'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install'
docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build'
2 changes: 1 addition & 1 deletion .php_cs.cache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"php":"7.4.29","version":"2.19.3:v2.19.3#75ac86f33fab4714ea5a39a396784d83ae3b5ed8","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"single_quote":true,"function_typehint_space":true,"hash_to_slash_comment":true,"method_separation":true,"no_blank_lines_after_phpdoc":true,"no_blank_lines_before_namespace":true,"no_unused_imports":true,"no_useless_else":true,"phpdoc_align":true,"phpdoc_order":true,"phpdoc_scalar":true,"pre_increment":true,"short_scalar_cast":true,"space_after_semicolon":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"semicolon_after_instruction":true,"trim_array_spaces":true,"whitespace_after_comma_in_array":true,"phpdoc_add_missing_param_annotation":true,"ordered_imports":true,"binary_operator_spaces":{"align_equals":false,"align_double_arrow":true},"concat_space":{"spacing":"one"},"array_syntax":{"syntax":"short"}},"hashes":{"src\/Page\/Blog\/BlogPageCriteriaEvent.php":314944644,"src\/Page\/Blog\/BlogPage.php":2706236335,"src\/Page\/Blog\/BlogPageLoader.php":3150878484,"src\/Page\/Blog\/BlogPageLoadedEvent.php":2307273889,"src\/Page\/Search\/BlogSearchPageLoader.php":4021084600,"src\/Page\/Search\/BlogSearchPage.php":3536611592,"src\/SasBlogModule.php":1784235949,"src\/Core\/Content\/Sitemap\/Provider\/BlogUrlProvider.php":2008718243,"src\/Util\/Update.php":3658249283,"src\/Util\/Lifecycle.php":3966690185,"src\/Content\/BlogAuthor\/BlogAuthorDefinition.php":265329503,"src\/Content\/BlogAuthor\/BlogAuthorEntity.php":2305064161,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationDefinition.php":3437891261,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationCollection.php":214717944,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationEntity.php":1087744547,"src\/Content\/BlogAuthor\/BlogAuthorCollection.php":384288389,"src\/Content\/BlogCategory\/BlogCategoryDefinition.php":4087296137,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationDefinition.php":2417094993,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationEntity.php":1453710896,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationCollection.php":1654547079,"src\/Content\/BlogCategory\/BlogCategoryEntity.php":4081984804,"src\/Content\/BlogCategory\/BlogCategoryIndexer.php":2342396229,"src\/Content\/BlogCategory\/BlogCategoryCollection.php":2647868457,"src\/Content\/Blog\/DataResolver\/SasCmsSlotsDataResolver.php":4122573966,"src\/Content\/Blog\/DataResolver\/BlogCmsElementResolver.php":2239832067,"src\/Content\/Blog\/DataResolver\/BlogSingleSelectDataResolver.php":3099369916,"src\/Content\/Blog\/DataResolver\/BlogDetailCmsElementResolver.php":3213698661,"src\/Content\/Blog\/Aggregate\/BlogCategoryMappingDefinition.php":4102877476,"src\/Content\/Blog\/BlogEntriesCollection.php":496021737,"src\/Content\/Blog\/BlogListingFilterBuildEvent.php":3440316816,"src\/Content\/Blog\/BlogEntriesEntity.php":3681564287,"src\/Content\/Blog\/Subscriber\/BlogSubscriber.php":2334093380,"src\/Content\/Blog\/Events\/BlogMainFilterEvent.php":4242742479,"src\/Content\/Blog\/BlogSeoUrlListener.php":4001334800,"src\/Content\/Blog\/BlogEntriesDefinition.php":156841383,"src\/Content\/Blog\/BlogSeoUrlRoute.php":1738305917,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationCollection.php":3605503894,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationEntity.php":2707099448,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationDefinition.php":60284177,"src\/Content\/SalesChannel\/Suggest\/ProductSuggestDecorated.php":289113257,"src\/Controller\/BlogController.php":1660253338,"src\/Controller\/StoreApi\/BlogControllerResponse.php":587140342,"src\/Controller\/StoreApi\/BlogController.php":518786207,"src\/Controller\/StoreApi\/AbstractBlogController.php":1300258681,"src\/Migration\/Migration1604520733DefaultBlogCategorySeeder.php":197359240,"src\/Migration\/Migration1612160298CreatePubslihedDateColumn.php":3546170814,"src\/Migration\/Migration1621260479AddVersionIdToBlogCategoryTable.php":49104478,"src\/Migration\/Migration1605031477CreateSasBlogAuthorTable.php":10683443,"src\/Migration\/Migration1604519670CreateSasBlogCategoryTable.php":300225515,"src\/Migration\/Migration1626760242AddCustomFieldToBlogTranslation.php":1239226930,"src\/Migration\/Migration1647338771SasBlogEntriesUpdate.php":69629835,"src\/Migration\/Migration1602739765AddTeaserImageColumnToBlogEntries.php":3088455465,"src\/Migration\/Migration1649322718CreateCmsPageForBlogEntries.php":4215710689,"src\/Migration\/Migration1559416986BlogEntries.php":414753366}}
{"php":"7.4.29","version":"2.19.3:v2.19.3#75ac86f33fab4714ea5a39a396784d83ae3b5ed8","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"single_quote":true,"function_typehint_space":true,"hash_to_slash_comment":true,"method_separation":true,"no_blank_lines_after_phpdoc":true,"no_blank_lines_before_namespace":true,"no_unused_imports":true,"no_useless_else":true,"phpdoc_align":true,"phpdoc_order":true,"phpdoc_scalar":true,"pre_increment":true,"short_scalar_cast":true,"space_after_semicolon":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"semicolon_after_instruction":true,"trim_array_spaces":true,"whitespace_after_comma_in_array":true,"phpdoc_add_missing_param_annotation":true,"ordered_imports":true,"binary_operator_spaces":{"align_equals":false,"align_double_arrow":true},"concat_space":{"spacing":"one"},"array_syntax":{"syntax":"short"}},"hashes":{"src\/Page\/Blog\/BlogPageCriteriaEvent.php":314944644,"src\/Page\/Blog\/BlogPage.php":2706236335,"src\/Page\/Blog\/BlogPageLoader.php":3150878484,"src\/Page\/Blog\/BlogPageLoadedEvent.php":2307273889,"src\/Page\/Search\/BlogSearchPageLoader.php":4021084600,"src\/Page\/Search\/BlogSearchPage.php":3536611592,"src\/WerklOpenBlogware.php":1784235949,"src\/Core\/Content\/Sitemap\/Provider\/BlogUrlProvider.php":2008718243,"src\/Util\/Update.php":3658249283,"src\/Util\/Lifecycle.php":3966690185,"src\/Content\/BlogAuthor\/BlogAuthorDefinition.php":265329503,"src\/Content\/BlogAuthor\/BlogAuthorEntity.php":2305064161,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationDefinition.php":3437891261,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationCollection.php":214717944,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationEntity.php":1087744547,"src\/Content\/BlogAuthor\/BlogAuthorCollection.php":384288389,"src\/Content\/BlogCategory\/BlogCategoryDefinition.php":4087296137,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationDefinition.php":2417094993,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationEntity.php":1453710896,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationCollection.php":1654547079,"src\/Content\/BlogCategory\/BlogCategoryEntity.php":4081984804,"src\/Content\/BlogCategory\/BlogCategoryIndexer.php":2342396229,"src\/Content\/BlogCategory\/BlogCategoryCollection.php":2647868457,"src\/Content\/Blog\/DataResolver\/WerklCmsSlotsDataResolver.php":4122573966,"src\/Content\/Blog\/DataResolver\/BlogCmsElementResolver.php":2239832067,"src\/Content\/Blog\/DataResolver\/BlogSingleSelectDataResolver.php":3099369916,"src\/Content\/Blog\/DataResolver\/BlogDetailCmsElementResolver.php":3213698661,"src\/Content\/Blog\/Aggregate\/BlogCategoryMappingDefinition.php":4102877476,"src\/Content\/Blog\/BlogEntriesCollection.php":496021737,"src\/Content\/Blog\/BlogListingFilterBuildEvent.php":3440316816,"src\/Content\/Blog\/BlogEntriesEntity.php":3681564287,"src\/Content\/Blog\/Subscriber\/BlogSubscriber.php":2334093380,"src\/Content\/Blog\/Events\/BlogMainFilterEvent.php":4242742479,"src\/Content\/Blog\/BlogSeoUrlListener.php":4001334800,"src\/Content\/Blog\/BlogEntriesDefinition.php":156841383,"src\/Content\/Blog\/BlogSeoUrlRoute.php":1738305917,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationCollection.php":3605503894,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationEntity.php":2707099448,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationDefinition.php":60284177,"src\/Content\/SalesChannel\/Suggest\/ProductSuggestDecorated.php":289113257,"src\/Controller\/BlogController.php":1660253338,"src\/Controller\/StoreApi\/BlogControllerResponse.php":587140342,"src\/Controller\/StoreApi\/BlogController.php":518786207,"src\/Controller\/StoreApi\/AbstractBlogController.php":1300258681,"src\/Migration\/Migration1604520733DefaultBlogCategorySeeder.php":197359240,"src\/Migration\/Migration1612160298CreatePubslihedDateColumn.php":3546170814,"src\/Migration\/Migration1621260479AddVersionIdToBlogCategoryTable.php":49104478,"src\/Migration\/Migration1605031477CreateWerklBlogAuthorTable.php":10683443,"src\/Migration\/Migration1604519670CreateWerklBlogCategoryTable.php":300225515,"src\/Migration\/Migration1626760242AddCustomFieldToBlogTranslation.php":1239226930,"src\/Migration\/Migration1647338771WerklBlogEntriesUpdate.php":69629835,"src\/Migration\/Migration1602739765AddTeaserImageColumnToBlogEntries.php":3088455465,"src\/Migration\/Migration1649322718CreateCmsPageForBlogEntries.php":4215710689,"src\/Migration\/Migration1559416986BlogEntries.php":414753366}}
2 changes: 1 addition & 1 deletion .phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ parameters:
excludes_analyse:
- ./src/Resources/app/administration/node_modules/*
- ./src/Resources/app/storefront/node_modules/*
- ./src/SasBlogModule.php
- ./src/WerklOpenBlogware.php
3 changes: 1 addition & 2 deletions CHANGELOG_de-DE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# 4.0.0
- Breaking: Plugin Klasse von SasBlogModule zu WerklOpenBlogware umbenannt
- Breaking: Databasen Tabllen prefix von `sas_blog_` auf `open_blogware_` geändert
- Breaking: Plugin interne Namensänderung von Sas\\BlogModule\\SasBlogModule zu Werkl\\OpenBlogware\\WerklOpenBlogware

# 3.0.4
- Überspringe-Artikel-Funktionalität für das neueste Blog-Artikel-Element
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG_en-GB.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# 4.0.0
- Breaking: Renamed plugin class from SasBlogModule to WerklOpenBlogware
- Breaking: Changed database table prefix from `sas_blog_` to `open_blogware_`
- Breaking: Renamed plugin internals from Sas\\BlogModule\\SasBlogModule to Werkl\\OpenBlogware\\WerklOpenBlogware

# 3.0.4
- Added offset count functionality to the newest blog items element
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ composer require werkstattl/openblogware
3. To install the plugin, run:
```sh
bin/console plugin:refresh
bin/console plugin:install --activate SasBlogModule
bin/console plugin:install --activate WerklOpenBlogware
```
4. To clear the cache, run:
```sh
Expand Down
2 changes: 1 addition & 1 deletion composer-ci.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"autoload": {
"psr-4": {
"Sas\\BlogModule\\": "src/"
"Werkl\\OpenBlogware\\": "src/"
}
}
}
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"infection/infection": "^0.29.6"
},
"extra": {
"shopware-plugin-class": "Sas\\BlogModule\\SasBlogModule",
"shopware-plugin-class": "Werkl\\OpenBlogware\\WerklOpenBlogware",
"plugin-icon": "src/Resources/config/plugin.png",
"copyright": "(c) by SMK Shape & Shift LTD and Werkstattl",
"label": {
Expand All @@ -54,12 +54,12 @@
},
"autoload": {
"psr-4": {
"Sas\\BlogModule\\": "src/"
"Werkl\\OpenBlogware\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"BlogModule\\Tests\\": "tests/PHPUnit/"
"OpenBlogware\\Tests\\": "tests/PHPUnit/"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ services:
ports:
- "80:80"
volumes:
- .:/var/www/html/custom/plugins/OpenBlogware
- .:/var/www/html/custom/plugins/WerklOpenBlogware
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ admin: ## Installs all admin dependencies

build: ## Installs the plugin, and builds
cd /var/www/html && php bin/console plugin:refresh
cd /var/www/html && php bin/console plugin:install SasBlogModule --activate | true
cd /var/www/html && php bin/console plugin:install WerklOpenBlogware --activate | true
cd /var/www/html && php bin/console plugin:refresh
cd /var/www/html && php bin/console theme:dump
cd /var/www/html && PUPPETEER_SKIP_DOWNLOAD=1 ./bin/build-js.sh
Expand All @@ -45,7 +45,7 @@ build: ## Installs the plugin, and builds
cd /var/www/html && php bin/console theme:refresh

phpunit: ## Starts all PHPUnit Tests
@XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration=phpunit.xml --coverage-html ../../../public/.reports/blogmodule/coverage
@XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration=phpunit.xml --coverage-html ../../../public/.reports/OpenBlogware/coverage


infection: ## Starts all Infection/Mutation tests
Expand Down
4 changes: 2 additions & 2 deletions phpunit.autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
include_once __DIR__ . '/vendor/autoload.php';

$classLoader = new Composer\Autoload\ClassLoader();
$classLoader->addPsr4('Sas\\BlogModule\\', __DIR__ . '/src', true);
$classLoader->addPsr4('BlogModule\\Tests\\', __DIR__ . '/tests/PHPUnit', true);
$classLoader->addPsr4('Werkl\\OpenBlogware\\', __DIR__ . '/src', true);
$classLoader->addPsr4('OpenBlogware\\Tests\\', __DIR__ . '/tests/PHPUnit', true);
$classLoader->register();
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
>

<testsuites>
<testsuite name="BlogModule Tests">
<testsuite name="OpenBlogware Tests">
<directory>./tests/PHPUnit/</directory>
</testsuite>
</testsuites>
Expand Down
Loading

0 comments on commit 621a79d

Please sign in to comment.