Pimcore 6.9 Compatibility | 3.3 Release (#155)

* follow up for #154: backport to b3 layout * adjust test branch, adjust upgrade docs * update readme
dachcom-digital · Jun 4, 2021 · 2b4db77 · 2b4db77
1 parent 09a9536
commit 2b4db77
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -1,9 +1,9 @@
 name: Codeception
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '3.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '3.x' ]
 
 jobs:
     codeception:
@@ -43,7 +43,7 @@ jobs:
             matrix:
                 php: [7.4]
                 symfony: [^4.4]
-                pimcore: [~6.6.0, ~6.7.0, ~6.8.0]
+                pimcore: [~6.6.0, ~6.7.0, ~6.8.0, ~6.9.0]
                 include:
                     -   pimcore: ~6.6.0
                         template_tag: v2.6.0
@@ -55,6 +55,8 @@ jobs:
                         symfony: ^3.4
                         php: 7.4
                         template_tag: v2.8.0
+                    -   pimcore: ~6.9.0
+                        template_tag: v2.8.19
         steps:
             -   uses: actions/checkout@v2
 

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -1,9 +1,9 @@
 name: Easy Coding Standards
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '3.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '3.x' ]
 
 jobs:
     ecs:

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -1,9 +1,9 @@
 name: PHP Stan
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '3.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '3.x' ]
 
 jobs:
     stan:

diff --git a/README.md b/README.md
@@ -14,15 +14,15 @@ The Toolbox is a Kickstarter for your every day project. It provides some import
 
 | Release | Supported Pimcore Versions        | Supported Symfony Versions | Release Date | Maintained     | Branch     |
 |---------|-----------------------------------|----------------------------|--------------|----------------|------------|
-| **3.x** | `6.0` - `6.8`                     | `3.4`, `^4.4`              | 16.07.2019   | Feature Branch | master     |
+| **3.x** | `6.0` - `6.9`                     | `3.4`, `^4.4`              | 16.07.2019   | Feature Branch | 3.x        |
 | **2.8** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4`                      | 30.06.2019   | Bugfix only    | 2.8        |
 | **1.8** | `4.0`                             | --                         | 28.04.2017   | Unsupported    | pimcore4   |
 
 ### Installation  
 
 ```json
 "require" : {
-    "dachcom-digital/toolbox" : "~3.2.0"
+    "dachcom-digital/toolbox" : "~3.3.0"
 }
 ```
 

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -6,6 +6,11 @@
 After every update you should check the pimcore extension manager. 
 Just click the "update" button or execute the migration command to finish the bundle update.
 
+#### Update from Version 3.2.5 to Version 3.3.0
+- **[NEW FEATURE]**: Pimcore 6.9.0 ready
+- **[IMPROVEMENT]**: use no-cookie domain for youtube videos [@ghettopro](https://github.com/dachcom-digital/pimcore-toolbox/pull/153)
+- **[BUG FIX]**: Fix invalid asset video markup[@gpalmisano](https://github.com/dachcom-digital/pimcore-toolbox/pull/154)
+
 #### Update from Version 3.2.4 to Version 3.2.5
 - **[BUG FIX]**: Fix column adjuster column_store availability check
 

diff --git a/src/ToolboxBundle/Resources/views/Toolbox/Bootstrap3/Video/type-asset.html.twig b/src/ToolboxBundle/Resources/views/Toolbox/Bootstrap3/Video/type-asset.html.twig
@@ -1,4 +1,4 @@
-<div class="player" data-poster-path="{{ posterPath }}" data-play-in-lightbox="{{ playInLightbox }}" data-video-uri="{{ videoId }}"></div>
+<div class="player" data-poster-path="{{ posterPath }}" data-play-in-lightbox="{{ playInLightbox }}" data-video-uri="{{ videoId }}">
 {{ pimcore_vhs('video', {
     'attributes': {
         'class': 'video-js vjs-default-skin vjs-big-play-centered',