Merge branch '3.0' into fix/silent-assigners

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
             env:
-                - DEPENDENCY_VERSIONS="sylius/sylius:1.7.*"
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.9.*"
+
+addons:
+    chrome: stable
+
+services:
+    - mysql
 
 cache:
     yarn: true
@@ -42,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
@@ -50,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 &
 
@@ -80,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"

UPGRADE.md

@@ -1,8 +1,12 @@
-# UPGRADE FROM 2.4 TO 2.5
+# 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,35 +12,37 @@
         "php": "^7.3",
         "league/csv": "^9.1",
         "friendsofsymfony/ckeditor-bundle": "^1.1|^2.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"
@@ -60,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,6 +52,24 @@ Import routing in your `config/routes.yaml` file:
 bitbag_sylius_cms_plugin:
     resource: "@BitBagSyliusCmsPlugin/Resources/config/routing.yml"
 ```
+If You have installed https://github.com/stefandoorn/sitemap-plugin according to its installation instructions
+import optional sitemap providers:
+```yaml
+# config/services.yaml
+...
+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

@@ -3,7 +3,7 @@
 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
+    $ composer require stefandoorn/sitemap-plugin ^2.0@alpha
 ``` 
 
 It's already configured after installation and contains a page & section provider. 

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
 

features/admin/managing_pages.feature

@@ -33,8 +33,9 @@ Feature: Managing cms pages
     @ui
     Scenario: Updating page with image
         Given there is a page in the store
+        And there is an existing "image" media with "aston-martin" code
         When I want to edit this page
         And I fill "Code, Content" fields
-        And I upload the "aston_martin_db_11.jpg" image
+        And I choose "aston-martin" media as image
         And I update it
         Then I should be notified that the page was updated

phpunit.xml.dist

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.6/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php">
+         bootstrap="tests/Application/config/bootstrap.php">
     <testsuites>
         <testsuite name="BitBagSyliusCmsPlugin Test Suite">
             <directory>tests</directory>
@@ -15,7 +15,7 @@
         <server name="KERNEL_CLASS" value="Tests\BitBag\SyliusCmsPlugin\Application\Kernel" />
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true"/>
         <server name="EXPECTED_RESPONSE_DIR" value="../Responses/Expected"/>
-        <env name="DATABASE_URL" value="sqlite:///%kernel.project_dir%/var/data.db" />
         <env name="APP_SECRET" value="''" />
+        <env name="APP_ENV" value="test"/>
     </php>
 </phpunit>

spec/Entity/PageImageSpec.php

@@ -12,7 +12,7 @@
 
 namespace spec\BitBag\SyliusCmsPlugin\Entity;
 
-use BitBag\SyliusCmsPlugin\Entity\PageImageInterface;
+use BitBag\SyliusCmsPlugin\Entity\MediaInterface;
 use BitBag\SyliusCmsPlugin\Entity\PageTranslation;
 use BitBag\SyliusCmsPlugin\Entity\PageTranslationInterface;
 use PhpSpec\ObjectBehavior;
@@ -37,7 +37,7 @@ function it_implements_page_translation_interface(): void
         $this->shouldHaveType(TranslationInterface::class);
     }
 
-    function it_allows_access_via_properties(PageImageInterface $pageImage): void
+    function it_allows_access_via_properties(MediaInterface $pageImage): void
     {
         $this->setName('Homepage');
         $this->getName()->shouldReturn('Homepage');