Merge branch '3.0' into fix/published_at

Author: leszczuu

.travis.yml

@@ -1,16 +1,22 @@
 language: php
 
-dist: trusty
+dist: bionic
 
 sudo: false
 
 matrix:
     include:
-        # Sylius 1.7
+        # Sylius 1.9
         -
-            php: 7.3
+            php: 7.4
             env:
-                - DEPENDENCY_VERSIONS="sylius/sylius:1.7.*"
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.9.*"
+
+addons:
+    chrome: stable
+
+services:
+    - mysql
 
 cache:
     yarn: true
@@ -32,6 +38,7 @@ before_install:
 
 install:
     - composer require ${DEPENDENCY_VERSIONS} --no-update
+    - composer require stefandoorn/sitemap-plugin --no-update
     - composer update --no-interaction --prefer-dist
     - (cd tests/Application && yarn install)
 
@@ -41,6 +48,7 @@ before_script:
     - (cd tests/Application && bin/console ckeditor:install --clear=drop -vvv)
     - (cd tests/Application && bin/console assets:install public -vvv)
     - (cd tests/Application && bin/console cache:warmup -vvv)
+    - (cd tests/Application && bin/console sylius:sitemap:generate -vvv)
     - (cd tests/Application && yarn build)
 
     # Configure display
@@ -49,23 +57,23 @@ before_script:
 
     # Download and configure ChromeDriver
     - |
-        if [ ! -f $SYLIUS_CACHE_DIR/chromedriver ] || [ "$($SYLIUS_CACHE_DIR/chromedriver --version | grep -c 2.34)" = "0" ]; then
-            curl http://chromedriver.storage.googleapis.com/2.34/chromedriver_linux64.zip > chromedriver.zip
+        export CHROMEDRIVER_STABLE_VERSION=$(curl https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
+        if [ ! -f $SYLIUS_CACHE_DIR/chromedriver ] || [ "$($SYLIUS_CACHE_DIR/chromedriver --version | grep -c $CHROMEDRIVER_STABLE_VERSION)" = "0" ]; then
+            curl https://chromedriver.storage.googleapis.com/$CHROMEDRIVER_STABLE_VERSION/chromedriver_linux64.zip > chromedriver.zip
             unzip chromedriver.zip
             chmod +x chromedriver
             mv chromedriver $SYLIUS_CACHE_DIR
+            rm chromedriver.zip
         fi
-
     # Run ChromeDriver
     - $SYLIUS_CACHE_DIR/chromedriver > /dev/null 2>&1 &
 
     # Download and configure Selenium
     - |
-        if [ ! -f $SYLIUS_CACHE_DIR/selenium.jar ] || [ "$(java -jar $SYLIUS_CACHE_DIR/selenium.jar --version | grep -c 3.4.0)" = "0" ]; then
-            curl http://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar > selenium.jar
+        if [ ! -f $SYLIUS_CACHE_DIR/selenium.jar ] || [ "$(java -jar $SYLIUS_CACHE_DIR/selenium.jar --version | grep -c 3.141.59)" = "0" ]; then
+            curl https://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar > selenium.jar
             mv selenium.jar $SYLIUS_CACHE_DIR
         fi
-
     # Run Selenium
     - java -Dwebdriver.chrome.driver=$SYLIUS_CACHE_DIR/chromedriver -jar $SYLIUS_CACHE_DIR/selenium.jar > /dev/null 2>&1 &
 
@@ -79,5 +87,5 @@ script:
     - vendor/bin/phpspec run
     - vendor/bin/behat --strict -vvv --no-interaction --tags '~@unstable' || vendor/bin/behat --strict -vvv --no-interaction --rerun --tags '~@unstable'
 
-after_failure:
-    - vendor/lakion/mink-debug-extension/travis/tools/upload-textfiles "${SYLIUS_BUILD_DIR}/*.log"
+#after_failure:
+#    - vendor/lakion/mink-debug-extension/travis/tools/upload-textfiles "${SYLIUS_BUILD_DIR}/*.log"

README.md

@@ -1,53 +1,34 @@
-<h1 align="center">
-    <a href="http://bitbag.shop" target="_blank">
-        <img src="doc/logo.png" width="55%" />
-    </a>
-    <br />
-    <a href="https://packagist.org/packages/bitbag/cms-plugin" title="License" target="_blank">
-        <img src="https://img.shields.io/packagist/l/bitbag/cms-plugin.svg" />
-    </a>
-    <a href="https://packagist.org/packages/bitbag/cms-plugin" title="Version" target="_blank">
-        <img src="https://img.shields.io/packagist/v/bitbag/cms-plugin.svg" />
-    </a>
-    <a href="http://travis-ci.org/BitBagCommerce/SyliusCmsPlugin" title="Build status" target="_blank">
-        <img src="https://img.shields.io/travis/BitBagCommerce/SyliusCmsPlugin/master.svg" />
-    </a>
-    <a href="https://scrutinizer-ci.com/g/BitBagCommerce/SyliusCmsPlugin/" title="Scrutinizer" target="_blank">
-        <img src="https://img.shields.io/scrutinizer/g/BitBagCommerce/SyliusCmsPlugin.svg" />
-    </a>
-    <a href="https://packagist.org/packages/bitbag/cms-plugin" title="Total Downloads" target="_blank">
-        <img src="https://poser.pugx.org/bitbag/cms-plugin/downloads" />
-    </a>
-    <p>
-        <img src="https://sylius.com/assets/badge-approved-by-sylius.png" width="85">
-    </p>
-</h1>
-
-## About us
-
-At BitBag we do believe in open source. However, we are able to do it just because of our awesome clients, who are kind enough to share some parts of our work with the community. Therefore, if you feel like there is a possibility for us working together, feel free to reach us out. You will find out more about our professional services, technologies and contact details at https://bitbag.io/.
-
-## BitBag SyliusCmsPlugin
-
-Almost each eCommerce app has to present some content. Managing it is often done via third-party libraries 
-like Wordpress, eZ Platform or a built-in content management system. As Sylius does not have a CMS in the 
-standard platform, we decided to develop our own which will be as flexible as Sylius. This plugin allows 
-you to add dynamic blocks with images, text or HTML to your storefront as well as pages and FAQs section.
-
-## Demo
-
-We created a demo app with some useful use-cases of the plugin! Visit [demo.bitbag.shop](https://demo.bitbag.shop) to take a look at it. 
-The admin can be accessed under [demo.bitbag.shop/admin](https://demo.bitbag.shop/admin) link and `sylius: sylius` credentials.
+# [![](https://bitbag.io/wp-content/uploads/2021/01/CMS.png)](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms)
 
-We also recorded a webinar which presents most of the plugin features, including how they have been implemented and specific use-cases.
+# BitBag SyliusCMSPlugin
 
-<div align="center">
-    
-[![Webinar](https://img.youtube.com/vi/Nk8fKA48t_Y/0.jpg)](https://www.youtube.com/watch?v=Nk8fKA48t_Y)
+----
 
-</div>
+[![](https://img.shields.io/packagist/l/bitbag/cms-plugin.svg) ](https://packagist.org/packages/bitbag/cms-plugin "License") [ ![](https://img.shields.io/packagist/v/bitbag/cms-plugin.svg) ](https://packagist.org/packages/bitbag/cms-plugin "Version") [ ![](https://img.shields.io/travis/BitBagCommerce/SyliusCMSPlugin/master.svg) ](http://travis-ci.org/BitBagCommerce/SyliusCMSPlugin "Build status") [ ![](https://img.shields.io/scrutinizer/g/BitBagCommerce/SyliusCMSPlugin.svg) ](https://scrutinizer-ci.com/g/BitBagCommerce/SyliusCMSPlugin/ "Scrutinizer") [![](https://poser.pugx.org/bitbag/cms-plugin/downloads)](https://packagist.org/packages/bitbag/cms-plugin "Total Downloads") [![Slack](https://img.shields.io/badge/community%20chat-slack-FF1493.svg)](http://sylius-devs.slack.com) [![Support](https://img.shields.io/badge/support-contact%20author-blue])](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms)
+
+<p>
+ <img src="https://sylius.com/assets/badge-approved-by-sylius.png" width="85">
+</p> 
+
+At BitBag we do believe in open source. However, we are able to do it just because of our awesome clients, who are kind enough to share some parts of our work with the community. Therefore, if you feel like there is a possibility for us working together, feel free to reach us out. You will find out more about our professional services, technologies and contact details at [https://bitbag.io/](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms).
+
+## Table of Content
+
+***
+
+* [Overwiev](#overwiev)
+* [Support](#we-are-here-to-help)
+* [About us](#about-us)
+    * [Community](#community)
+* [Demo](#demo)
+* [License](#license)
+* [Contact](#contact)
+
+# Overwiev
+
+***
 
-## Documentation
+Almost each eCommerce app has to present some content. Managing it is often done via third-party libraries like Wordpress, eZ Platform or a built-in content management system. As Sylius does not have a CMS in the standard platform, we decided to develop our own which will be as flexible as Sylius. This plugin allows you to add dynamic blocks with images, text or HTML to your storefront as well as pages and FAQs section.
 
 - [Installation](doc/installation.md)
 - [Upgrading](UPGRADE.md)
@@ -63,6 +44,79 @@ We also recorded a webinar which presents most of the plugin features, including
 - [Sitemap](doc/sitemap.md)
 - [Customization](doc/customization.md)
 
-## Contribution
+## We are here to help
+This **open-source plugin was developed to help the Sylius community**. If you have any additional questions, would like help with installing or configuring the plugin or need any assistance with your Sylius project - let us know!
+
+[![](https://bitbag.io/wp-content/uploads/2020/10/button-contact.png)](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms)
+
+Read more about  [Sylius  CMS](https://bitbag.io/sylius-cms-all-you-need-to-know-3-implementation-methods/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms)
+# About us
+
+---
+
+BitBag is an agency that provides high-quality **eCommerce and Digital Experience software**. Our main area of expertise includes eCommerce consulting and development for B2C, B2B, and Multi-vendor Marketplaces.
+The scope of our services related to Sylius includes:
+- **Consulting** in the field of strategy development
+- Personalized **headless software development**
+- **System maintenance and long-term support**
+- **Outsourcing**
+- **Plugin development**
+- **Data migration**
+
+Some numbers regarding Sylius:
+* **20+ experts** including consultants, UI/UX designers, Sylius trained front-end and back-end developers,
+* **100+ projects** delivered on top of Sylius,
+* Clients from  **20+ countries**
+* **3+ years** in the Sylius ecosystem.
+
+---
+
+If you need some help with Sylius development, don't be hesitate to contact us directly. You can fill the form on [this site](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms) or send us an e-mail to hello@bitbag.io!
+
+---
+
+[![](https://bitbag.io/wp-content/uploads/2020/10/badges-sylius.png)](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms)
+
+## Community
+
+---- 
+
+For online communication, we invite you to chat with us & other users on [Sylius Slack](https://sylius-devs.slack.com/).
+
+# Demo
+
+---
+
+We created a demo app with some useful use-cases of the plugin! Visit [demo.bitbag.shop](https://demo.bitbag.shop) to take a look at it.
+The admin can be accessed under [demo.bitbag.shop/admin](https://demo.bitbag.shop/admin) link and `sylius: sylius` credentials.
+
+We also recorded a webinar which presents most of the plugin features, including how they have been implemented and specific use-cases.
+
+<div align="center">
+
+[![Webinar](https://img.youtube.com/vi/Nk8fKA48t_Y/0.jpg)](https://www.youtube.com/watch?v=Nk8fKA48t_Y)
+
+</div>
+
+
+
+**If you need an overview of this plugin, schedule a consultation with our expert.**
+
+[![](https://bitbag.io/wp-content/uploads/2020/10/button_free_consulatation-1.png)](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms)
+
+
+
+## License
+
+---
+
+This plugin's source code is completely free and released under the terms of the MIT license.
+
+[//]: # (These are reference links used in the body of this note and get stripped out when the markdown processor does its job. There is no need to format nicely because it shouldn't be seen.)
+
+## Contact
+
+---
+If you want to contact us, the best way is to fill the form on [our website](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms) or send us an e-mail to hello@bitbag.io with your question(s). We guarantee that we answer as soon as we can!
 
-Learn more about our contribution workflow on http://docs.sylius.org/en/latest/contributing/.
+[![](https://bitbag.io/wp-content/uploads/2020/10/footer.png)](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_cms)

UPGRADE.md

@@ -1,3 +1,12 @@
+# UPGRADE FROM 2.4 TO 3.0 
+
+* The `stefandoorn/sitemap-plugin` dependency has been removed, and moved to the `suggest` section of composer.json.
+If you didn't require this plugin by yourselves, but want to keep the sitemap support, consider requiring it directly in your project as described [here](doc/sitemap.md).
+
+* Width and height has been added to image media. Now width and height html tags are generated in shop image.
+  Read the below changelog first and then migrate your structure using 
+  `bin/console doctrine:migrations:diff && bin/console doctrine:migrations:migrate` commands
+
 # UPGRADE FROM 1.0 TO 2.0
 
 * A lot of database modifications has been made. Read the below changelog first and then migrate your

composer.json

@@ -12,36 +12,40 @@
         "php": "^7.3",
         "league/csv": "^9.1",
         "friendsofsymfony/ckeditor-bundle": "^1.1|^2.0",
-        "stefandoorn/sitemap-plugin": "^1.0",
-        "sylius/sylius": "^1.7"
+        "sylius/sylius": "^1.9"
     },
     "require-dev": {
-        "behat/behat": "^3.6",
-        "behat/mink": "^1.7",
-        "behat/mink-browserkit-driver": "^1.3",
-        "behat/mink-extension": "^2.2",
-        "behat/mink-selenium2-driver": "^1.3",
+        "behat/behat": "^3.7",
+        "behat/mink": "^1.8",
+        "behat/mink-selenium2-driver": "^1.4",
+        "friends-of-behat/mink-browserkit-driver": "^1.4",
+        "friends-of-behat/mink-debug-extension": "^2.0",
+        "friends-of-behat/mink-extension": "^2.4",
         "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^2.0",
-        "friends-of-behat/variadic-extension": "^1.1",
-        "lakion/mink-debug-extension": "^1.2.3",
-        "lchrusciel/api-test-case": "^3.0",
-        "matthiasnoback/symfony-config-test": "^3.0",
-        "phpspec/phpspec": "^6.0",
-        "phpstan/phpstan-doctrine": "^0.10",
-        "phpstan/phpstan-shim": "^0.10",
-        "phpstan/phpstan-symfony": "^0.10",
-        "phpstan/phpstan-webmozart-assert": "^0.10",
-        "phpunit/phpunit": "^6.5",
-        "sensiolabs/security-checker": "^5.0",
-        "sylius-labs/coding-standard": "^3.0",
-        "symfony/browser-kit": "^4.4",
-        "symfony/debug-bundle": "^4.4",
-        "symfony/dotenv": "^4.4",
-        "symfony/intl": "^4.4",
-        "symfony/web-profiler-bundle": "^4.4",
-        "symfony/web-server-bundle": "^4.4"
+        "friends-of-behat/symfony-extension": "^2.1",
+        "friends-of-behat/variadic-extension": "^1.3",
+        "friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev",
+        "lchrusciel/api-test-case": "^4.1||^5.0",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "phpspec/phpspec": "^7.0",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-doctrine": "^0.12.32",
+        "phpstan/phpstan-symfony": "^0.12.21",
+        "phpstan/phpstan-webmozart-assert": "^0.12.12",
+        "phpunit/phpunit": "^8.0||^9.0",
+        "sylius-labs/coding-standard": "^3.2",
+        "symfony/browser-kit": "^4.4||^5.2",
+        "symfony/debug-bundle": "^4.4||^5.2",
+        "symfony/dotenv": "^4.4||^5.2",
+        "symfony/intl": "^4.4||^5.2",
+        "symfony/web-profiler-bundle": "^4.4||^5.2"
+    },
+    "suggest": {
+        "stefandoorn/sitemap-plugin": "^2.0@alpha"
+    },
+    "suggest": {
+        "stefandoorn/sitemap-plugin": "Adds CMS pages & sections support to the Sylius sitemap plugin"
     },
     "conflict": {
         "symfony/symfony": "4.1.8",
@@ -58,6 +62,9 @@
         }
     },
     "autoload-dev": {
+        "psr-4": {
+            "spec\\BitBag\\SyliusCmsPlugin\\": "spec/"
+        },
         "classmap": ["tests/Application/Kernel.php"]
     }
 }

doc/installation.md

@@ -9,7 +9,6 @@ return [
     ...
 
     FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true], // WYSIWYG editor
-    SitemapPlugin\SitemapPlugin::class => ['all' => true], // Sitemap support
     BitBag\SyliusCmsPlugin\BitBagSyliusCmsPlugin::class  => ['all' => true],
 ];
 ```
@@ -53,8 +52,8 @@ Import routing in your `config/routes.yaml` file:
 bitbag_sylius_cms_plugin:
     resource: "@BitBagSyliusCmsPlugin/Resources/config/routing.yml"
 ```
-
-Import optional sitemap providers:
+If You have installed https://github.com/stefandoorn/sitemap-plugin according to its installation instructions
+import optional sitemap providers:
 ```yaml
 # config/services.yaml
 ...
@@ -63,6 +62,14 @@ imports:
     - { resource: "@BitBagSyliusCmsPlugin/Resources/config/services/sitemap_provider.yml" }
 ```
 
+and plugin dependency to your `config/bundles.php` file:
+```php
+return [
+    ...
+
+    SitemapPlugin\SitemapPlugin::class => ['all' => true], // Sitemap support
+];
+```
 
 Finish the installation by updating the database schema and installing assets:
 ```

doc/sitemap.md

@@ -1,6 +1,11 @@
 # Sitemap
 
-This plugin uses Sylius sitemap plugin. It's already configured with the default installation
-and contains a page & section provider. 
+This plugin suggests to install the Sylius sitemap plugin. The plugin is not installed automatically, but to install run:
+
+```bash
+    $ composer require stefandoorn/sitemap-plugin ^2.0@alpha
+``` 
+
+It's already configured after installation and contains a page & section provider. 
 
 For more information, read the original [SitemapPlugin documentation](https://github.com/stefandoorn/sitemap-plugin).

features/admin/adding_page.feature

@@ -32,14 +32,15 @@ Feature: Adding new page
 
     @ui @javascript
     Scenario: Adding page with page image
+        And there is an existing "image" media with "aston-martin" code
         When I go to the create page page
         And I fill the code with "aston_martin_is_amazing_car"
         And I fill the slug with "aston_martin_is_amazing_car"
         And I fill the name with "Aston Martin is amazing car"
         And I fill the meta keywords with "Aston Martin is amazing car"
         And I fill the meta description with "Aston Martin is amazing car for this summer."
         And I fill the content with "Aston Martin is amazing car for this summer. Buy it."
-        And I upload the "aston_martin_db_11.jpg" image
+        And I choose "aston-martin" media as image
         And I add it
         Then I should be notified that the page has been created