Merge pull request #5413 from redCOMPONENT-COM/3.0.2

Release redSHOP 3.0.2

.drone.yml

@@ -34,9 +34,9 @@ pipeline:
             - while [ ! -f tests/.cache.composer.tmp ]; do sleep 1; done                        # Comment if not using composer cache
             # - composer config --global --auth github-oauth.github.com 4281d0ba7e8f1caded4c8b949a1c115902e30113
             # - composer install --prefer-dist                                                  # Uncomment if not using composer cache
-            - while [ ! -f tests/.cache.libraries.redshop.composer.tmp ]; do sleep 1; done      # Comment if not using composer cache for libraries
+            # - while [ ! -f tests/.cache.libraries.redshop.composer.tmp ]; do sleep 1; done      # Comment if not using composer cache for libraries
             # - composer install --prefer-dist -d libraries/redshop                             # Uncomment if not using composer cache for libraries
-            - while [ ! -f tests/.cache.plugins.redshop_pdf.composer.tmp ]; do sleep 1; done    # Comment if not using composer cache for redshopb_pdf plugin
+            # - while [ ! -f tests/.cache.plugins.redshop_pdf.composer.tmp ]; do sleep 1; done    # Comment if not using composer cache for redshopb_pdf plugin
             # - composer install --prefer-dist -d plugins/redshop_pdf/tcpdf/helper              # Uncomment if not using composer cache for redshopb_pdf plugin
 
             # npm setup
@@ -47,10 +47,8 @@ pipeline:
             # - npm install gulp                                                                # Uncomment if not using npm cache
             - npm audit fix
             - composer config -g repo.packagist composer https?://packagist.jp
-            - cd libraries/redshop
-            - composer install --prefer-dist
-            - cd ../..
             - mv gulp-config.json.dist gulp-config.json
+            - gulp composer
             - gulp release --skip-version
 
             # clone Paid Extensions
@@ -342,9 +340,7 @@ pipeline:
             # Waits until Chromedriver is up and running
             - while ! nc -z localhost 9515; do sleep 1; done
             # Performs test
-            - su www-data -c 'vendor/bin/robo tests:run acceptance/integration/g17/Plugins/payment 0 0'
             - su www-data -c 'vendor/bin/robo tests:run acceptance/integration/g17/Plugins/Shipping 0 0'
-            - su www-data -c 'vendor/bin/robo tests:run acceptance/integration/g17/Category 0 0'
 
     12-Group12:
         group: 01-tests
@@ -366,6 +362,27 @@ pipeline:
             # Performs test
             - su www-data -c 'vendor/bin/robo tests:run acceptance/integration/g17/Module 0 0'
             - su www-data -c 'vendor/bin/robo tests:run acceptance/administrator/g15/Wishlist 0 0'
+            - su www-data -c 'vendor/bin/robo tests:run acceptance/integration/g17/Category 0 0'
+
+    13-Group13:
+        group: 01-tests
+        image: redwebaps/testbox-chromedriver:79.0-n12
+        environment:
+            - tests_user=admin
+            - tests_suite=13-Group13
+            - tests_db=group13
+            - build_path=/drone/src/github.com/${DRONE_REPO}
+            - output_append=-13-Group13
+            - php_version=73
+        commands:
+            # Regular entry point
+            - /entrypoint.sh &
+            # Performs test after ensuring that the scenario has been fully set up
+            - while [ ! -f tests/.cache.setup.$tests_suite$php_version.tmp ]; do sleep 1; done
+            # Waits until Chromedriver is up and running
+            - while ! nc -z localhost 9515; do sleep 1; done
+            # Performs test
+            - su www-data -c 'vendor/bin/robo tests:run acceptance/integration/g17/Plugins/payment 0 0'
 
 services:
     db:
@@ -404,6 +421,7 @@ services:
             - sh tests/drone/setup-stages.sh        "group10"                              "10-Group10"                 $php_versions
             - sh tests/drone/setup-stages.sh        "group11"                              "11-Group11"                 $php_versions
             - sh tests/drone/setup-stages.sh        "group12"                              "12-Group12"                 $php_versions
+            - sh tests/drone/setup-stages.sh        "group13"                              "13-Group13"                 $php_versions
 
 branches:
     exclude: [ crowdin ]

README.md

@@ -44,10 +44,13 @@ There are an MySQL Workbench DB Model file in src/db/redshop.mwb. When need some
 - Almost tags system of redSHOP using Twig template instead of PHP inline
 - Remaining layouts, views of redSHOP is moving to Twig and PHP Inline will be deprecated soon.
 
-## Release process for redSHOP
-Please follow the next steps in order to release a new version of redSHOP.
+## How to avoid twig confliction with an other component
 
-- Execute component_packager.xml PHING file to generate the main component package (includes 1 module and 2 plugins).
+- Update redshop to version 3.0.2
+- Copy file https://github.com/redCOMPONENT-COM/redSHOP/blob/develop/libraries/redshop/composer.json to WebRoot/libraries/redshop
+- run cd `webroot/libraries/redshop`
+- run `composer update`
+- Go to plugin `System - redSHOP` and disable twig
 
 ## Using Gulp build system
 

RoboFile.php

@@ -24,7 +24,7 @@ class RoboFile extends \Robo\Tasks
 	/**
 	 * @var   array
 	 * @var   array
-	 * @since __DEPLOY_VERSION__
+	 * @since 3.0.2
 	 */
 	private $defaultArgs = [
 		'--tap',
@@ -64,7 +64,7 @@ public function testsSitePreparation($use_htaccess = 1, $cleanUp = 1)
 			* When joomla Staging branch has a bug you can uncomment the following line as a tmp fix for the tests layer.
 			* Use as $version value the latest tagged stable version at: https://github.com/joomla/joomla-cms/releases
 			*/
-			$version = '3.9.16';
+			$version = '3.9.19';
 
 			$this->_exec("git clone -b $version --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/joomla-cms");
 			$this->say("Joomla CMS ($version) site created at tests/joomla-cms");
@@ -114,7 +114,7 @@ public function testsPaidExtensionsForIntegrationTests($cleanUp = 1)
 	 * @param   boolean  $extraVerbose  Add extra verbosity
 	 *
 	 * @return  void
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.0.2
 	 */
 	public function testsSetup($debug = true, $steps = true, $extraVerbose = false)
 	{
@@ -166,7 +166,7 @@ public function testsSetup($debug = true, $steps = true, $extraVerbose = false)
 	 * @param   boolean  $extraVerbose  Add extra verbosity
 	 *
 	 * @return  void
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.0.2
 	 */
 	public function testsRun($folder, $debug = true, $steps = true, $extraVerbose = false)
 	{
@@ -222,7 +222,7 @@ public function testsRun($folder, $debug = true, $steps = true, $extraVerbose =
 	 * @param   string  $buildURL             Build URL
 	 *
 	 * @return  void
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.0.2
 	 */
 	public function sendBuildReportErrorSlack($cloudinaryName, $cloudinaryApiKey, $cloudinaryApiSecret, $githubRepository, $githubPRNo, $slackWebhook, $slackChannel, $buildURL = '')
 	{
@@ -248,7 +248,7 @@ public function sendBuildReportErrorSlack($cloudinaryName, $cloudinaryApiKey, $c
 	 * @param   string  $buildURL             Build URL
 	 *
 	 * @return  void
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.0.2
 	 */
 	public function sendBuildReportErrorSlackDirectory($directory, $cloudinaryName, $cloudinaryApiKey, $cloudinaryApiSecret, $githubRepository, $githubPRNo, $slackWebhook, $slackChannel, $buildURL = '')
 	{