From 83c82023742ed9b814153dd1255983d97d0ba53b Mon Sep 17 00:00:00 2001 From: Arlen Walker Date: Thu, 15 Feb 2018 13:43:15 -0600 Subject: [PATCH 01/69] Add the category description This will pick up the category description and make it available to the output of the module. No effect on backwards compatibility, as it doesn't change what exists now, merely adds one more attribute. Use Case: When you're choosing to output subcategories, it might be useful in some cases to have more than just the category name available. Output templates that don't need it can ignore it safely, but this makes it available for the templates that might want to use it. --- src/modules/mod_weblinks/helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/mod_weblinks/helper.php b/src/modules/mod_weblinks/helper.php index 78a27ce..553726b 100644 --- a/src/modules/mod_weblinks/helper.php +++ b/src/modules/mod_weblinks/helper.php @@ -83,7 +83,7 @@ class ModWeblinksHelper $model->setState( 'list.select', - 'a.*, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ',' . 'DATE_FORMAT(a.created, "%Y-%m-%d") AS created' + 'a.*, c.description AS c_description, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ',' . 'DATE_FORMAT(a.created, "%Y-%m-%d") AS created' ); $model->setState('filter.c.published', 1); From 5f8f6cc0ccd64ee2be039f227505acd8233834fe Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 7 Jun 2018 11:17:08 +0300 Subject: [PATCH 02/69] Don't hide filter form --- .../views/category/tmpl/default_items.php | 233 +++++++++--------- 1 file changed, 118 insertions(+), 115 deletions(-) diff --git a/src/components/com_weblinks/views/category/tmpl/default_items.php b/src/components/com_weblinks/views/category/tmpl/default_items.php index c49b298..d0aac0c 100644 --- a/src/components/com_weblinks/views/category/tmpl/default_items.php +++ b/src/components/com_weblinks/views/category/tmpl/default_items.php @@ -29,143 +29,146 @@ $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); ?> -items)) : ?> -

- -
params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) : ?> -
- params->get('filter_field') != 'hide') : ?> -
- - -
- +
+ params->get('filter_field') != 'hide') : ?> +
+ + +
+ - params->get('show_pagination_limit')) : ?> -
- - pagination->getLimitBox(); ?> -
- -
+ params->get('show_pagination_limit')) : ?> +
+ + pagination->getLimitBox(); ?> +
+ +
+ + items)) : ?> +

+
    items as $i => $item) : ?> access, $this->user->getAuthorisedViewLevels())) : ?> items[$i]->state == 0) : ?>
  • -
  • +
  • - params->get('show_link_hits', 1)) : ?> - - hits); ?> - - - - - - - - - -
    - params->get('icons', 1) == 0) : ?> - - params->get('icons', 1) == 1) : ?> - params->get('link_icons')) : ?> - - - params->get('link_icons') . '" alt="' . JText::_('COM_WEBLINKS_LINK') . '" />'; ?> + params->get('show_link_hits', 1)) : ?> + + hits); ?> + - - - pageclass_sfx; ?> - link; ?> - params->get('width'); ?> - params->get('height'); ?> - - - - - items[$i]->state == 0) : ?> - - - params->get('target', $this->params->get('target'))) - { - case 1: - // Open in a new window - echo '' . - $this->escape($item->title) . ''; - break; - - case 2: - // Open in a popup window - $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; - echo "" . - $this->escape($item->title) . ''; - break; - case 3: - // Open in a modal window - JHtml::_('behavior.modal', 'a.modal'); - echo '' . - $this->escape($item->title) . ' '; - break; - - default: - // Open in parent window - echo '' . - $this->escape($item->title) . ' '; - break; - } - ?> -
    - tags->getItemTags('com_weblinks.weblink', $item->id); ?> - params->get('show_tags', 1)) : ?> - item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> - item->tagLayout->render($tagsData); ?> - - params->get('show_link_description')) and ($item->description != '')) : ?> - images); ?> - image_first) and !empty($images->image_first)) : ?> - float_first)) ? $this->params->get('float_first') : $images->float_first; ?> -
    image_first_caption) : ?> - image_first_caption) . '"'; ?> + + + + + + +
    + params->get('icons', 1) == 0) : ?> + + params->get('icons', 1) == 1) : ?> + params->get('link_icons')) : ?> + + + params->get('link_icons') . '" alt="' . JText::_('COM_WEBLINKS_LINK') . '" />'; ?> + + + + pageclass_sfx; ?> + link; ?> + params->get('width', 600); ?> + params->get('height', 500); ?> + items[$i]->state == 0) : ?> + + + + params->get('target', $this->params->get('target'))) + { + case 1: + // Open in a new window + echo '' . + $this->escape($item->title) . ''; + break; + + case 2: + // Open in a popup window + $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; + echo '' . + $this->escape($item->title) . ''; + break; + case 3: + // Open in a modal window + JHtml::_('behavior.modal', 'a.modal'); + echo '' . + $this->escape($item->title) . ''; + break; + + default: + // Open in parent window + echo '' . + $this->escape($item->title) . ''; + break; + } + ?> +
    + tags->getItemTags('com_weblinks.weblink', $item->id); ?> + params->get('show_tags', 1)) : ?> + item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> + item->tagLayout->render($tagsData); ?> + + params->get('show_link_description')) && ($item->description != '')) : ?> + images); ?> + image_first) && !empty($images->image_first)) : ?> + float_first ?: $this->params->get('float_first'); ?> +
    + image_first_caption) : ?> + image_first_caption) . '"'; ?> + + src="image_first); ?>" + alt="image_first_alt); ?>" + /> +
    + + image_second) && !empty($images->image_second)) : ?> + float_second ?: $this->params->get('float_second'); ?> +
    + image_second_caption) : ?> + image_second_caption) . '"'; ?> + + src="image_second); ?>" + alt="image_second_alt); ?>" + /> +
    + + description; ?> - src="image_first); ?>" alt="image_first_alt); ?>"/>
    - - image_second) and !empty($images->image_second)) : ?> - float_second)) ? $this->params->get('float_second') : $images->float_second; ?> -
    image_second_caption) : ?> - image_second_caption) . '"'; ?> - - src="image_second); ?>" alt="image_second_alt); ?>"/>
    - - description; ?> -
+ - - params->get('show_pagination')) : ?> + params->get('show_pagination')) : ?> - -
- + pagination->getPagesLinks(); ?> + + + From 802cff4ae81d5902b0d2b230634321d93155f316 Mon Sep 17 00:00:00 2001 From: Elijah Madden Date: Fri, 15 Mar 2019 21:24:27 +0900 Subject: [PATCH 03/69] Use correct database (#391) Suppose you're not operating on the default Joomla database (the one returned by `JFactory::getDbo()`) but on another one entirely? In theory, it is possible. In that case, you will want this new table object to use the same DBO that `$this` is using. If you look at any similar table classes that are built in to Joomla, you will see this same kind of thing. So this is consistent with Joomla practices. --- src/administrator/components/com_weblinks/tables/weblink.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/administrator/components/com_weblinks/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php index a7910ec..a4963fb 100644 --- a/src/administrator/components/com_weblinks/tables/weblink.php +++ b/src/administrator/components/com_weblinks/tables/weblink.php @@ -91,7 +91,7 @@ class WeblinksTableWeblink extends JTable } // Verify that the alias is unique - $table = JTable::getInstance('Weblink', 'WeblinksTable'); + $table = JTable::getInstance('Weblink', 'WeblinksTable', array('dbo' => $this->getDbo())); if ($table->load(array('language' => $this->language, 'alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0)) { From ea64e3777c1ca3875aaa4a1133cfe21921295b98 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sun, 16 Jun 2019 23:11:44 +0200 Subject: [PATCH 04/69] Improve README.md --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8f114ee..425258b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -# Weblinks for Joomla! Travis: +# Weblinks for Joomla! -Travis: [![Travis Build Status](https://travis-ci.org/joomla-extensions/weblinks.svg?branch=master)](https://travis-ci.org/joomla-extensions/weblinks) +Build Status +--------------------- +| Travis-CI | Drone-CI | +| ------------- | ------------- | ------------- | +| [![Build Status](https://travis-ci.org/joomla-extensions/weblinks.svg?branch=master)](https://travis-ci.org/joomla-extensions/weblinks) | [![Build Status](https://ci.joomla.org/api/badges/joomla-extensions/weblinks/status.svg)](https://ci.joomla.org/joomla-extensions/weblinks) | -Drone: [![Drone Build Status](http://213.160.72.75/api/badges/joomla-extensions/weblinks/status.svg)](http://213.160.72.75/joomla-extensions/weblinks) - -This repo is meant to hold the decoupled com_weblinks component and related code. +Weblinks for Joomla! provides a component and further accompanying extensions to create a directory of weblinks. # How to test a PR From a012bc7b63176dfb51ba2586dcaf02c4fed98133 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Sat, 10 Aug 2019 20:27:18 +0100 Subject: [PATCH 05/69] Update composer files and move to undeprecated jrobo --- RoboFile.php | 4 +- composer.json | 8 +- composer.lock | 1738 ++++++++++++++++++++++++++++++++++++------------- 3 files changed, 1292 insertions(+), 458 deletions(-) diff --git a/RoboFile.php b/RoboFile.php index b6249ba..30b6275 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -29,7 +29,7 @@ if (!defined('JPATH_BASE')) class RoboFile extends \Robo\Tasks { // Load tasks from composer, see composer.json - use \joomla_projects\robo\loadTasks; + use \Joomla\Testing\Robo\Tasks\loadTasks; use \Joomla\Jorobo\Tasks\loadTasks; /** @@ -83,7 +83,7 @@ class RoboFile extends \Robo\Tasks { if ($this->isWindows()) { - // Check wehter git.exe or git as command should be used, + // Check whether git.exe or git as command should be used, // As on window both is possible if (!$this->_exec('git.exe --version')->getMessage()) { diff --git a/composer.json b/composer.json index e3a53fd..aa42700 100644 --- a/composer.json +++ b/composer.json @@ -8,16 +8,16 @@ } }, "require" : { - "php": ">=5.3.10" + "php": ">=5.4" }, "require-dev": { "codeception/codeception": "^2.2", "joomla-projects/joomla-browser": "v3.6.5.1", "consolidation/robo": "^1.0.0", - "joomla-projects/robo": "~0", + "joomla-projects/joomla-testing-robo": "~1.0", "joomla-projects/selenium-server-standalone": "v3.1.0", "fzaninotto/faker": "^1.6", - "joomla-projects/jorobo": "~0.6", - "Behat/Gherkin": "^4.4.1" + "joomla-projects/jorobo": "~0.7", + "behat/gherkin": "^4.4.1" } } diff --git a/composer.lock b/composer.lock index 665b164..b8ee76d 100644 --- a/composer.lock +++ b/composer.lock @@ -1,24 +1,24 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b8d54335b03ccb86dc3697d1ce8f11d4", + "content-hash": "8e471a057bb2ecb11e1f699032d7c341", "packages": [], "packages-dev": [ { "name": "behat/gherkin", - "version": "v4.4.5", + "version": "v4.6.0", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74" + "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07", + "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07", "shasum": "" }, "require": { @@ -26,8 +26,8 @@ }, "require-dev": { "phpunit/phpunit": "~4.5|~5", - "symfony/phpunit-bridge": "~2.7|~3", - "symfony/yaml": "~2.3|~3" + "symfony/phpunit-bridge": "~2.7|~3|~4", + "symfony/yaml": "~2.3|~3|~4" }, "suggest": { "symfony/yaml": "If you want to parse features, represented in YAML files" @@ -64,65 +64,114 @@ "gherkin", "parser" ], - "time": "2016-10-30T11:50:56+00:00" + "time": "2019-01-16T14:22:17+00:00" }, { - "name": "codeception/codeception", - "version": "2.2.11", + "name": "cloudinary/cloudinary_php", + "version": "1.14.0", "source": { "type": "git", - "url": "https://github.com/Codeception/Codeception.git", - "reference": "a8681b416921ae282ccca2c485d75a3ed6756080" + "url": "https://github.com/cloudinary/cloudinary_php.git", + "reference": "d4c947f6728c339649a10999a6a6362e5c7b9490" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/a8681b416921ae282ccca2c485d75a3ed6756080", - "reference": "a8681b416921ae282ccca2c485d75a3ed6756080", + "url": "https://api.github.com/repos/cloudinary/cloudinary_php/zipball/d4c947f6728c339649a10999a6a6362e5c7b9490", + "reference": "d4c947f6728c339649a10999a6a6362e5c7b9490", "shasum": "" }, "require": { - "behat/gherkin": "~4.4.0", + "ext-curl": "*", + "ext-json": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "4.8.*" + }, + "type": "library", + "autoload": { + "classmap": [ + "src" + ], + "files": [ + "src/Helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cloudinary", + "homepage": "https://github.com/cloudinary/cloudinary_php/graphs/contributors" + } + ], + "description": "Cloudinary PHP SDK", + "homepage": "https://github.com/cloudinary/cloudinary_php", + "keywords": [ + "cdn", + "cloud", + "cloudinary", + "image management", + "sdk" + ], + "time": "2019-05-13T14:27:40+00:00" + }, + { + "name": "codeception/codeception", + "version": "2.4.1", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Codeception.git", + "reference": "bca3547632556875f1cdd567d6057cc14fe472b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/bca3547632556875f1cdd567d6057cc14fe472b8", + "reference": "bca3547632556875f1cdd567d6057cc14fe472b8", + "shasum": "" + }, + "require": { + "behat/gherkin": "^4.4.0", + "codeception/phpunit-wrapper": "^6.0.9|^7.0.6", + "codeception/stub": "^1.0", "ext-json": "*", "ext-mbstring": "*", - "facebook/webdriver": ">=1.0.1 <2.0", + "facebook/webdriver": ">=1.1.3 <2.0", "guzzlehttp/guzzle": ">=4.1.4 <7.0", "guzzlehttp/psr7": "~1.0", "php": ">=5.4.0 <8.0", - "phpunit/php-code-coverage": ">=2.2.4 <6.0", - "phpunit/phpunit": ">4.8.20 <6.0", - "phpunit/phpunit-mock-objects": ">2.3 <5.0", - "sebastian/comparator": ">1.1 <3.0", - "sebastian/diff": "^1.4", - "stecman/symfony-console-completion": "^0.7.0", - "symfony/browser-kit": ">=2.7 <4.0", - "symfony/console": ">=2.7 <4.0", - "symfony/css-selector": ">=2.7 <4.0", - "symfony/dom-crawler": ">=2.7.5 <4.0", - "symfony/event-dispatcher": ">=2.7 <4.0", - "symfony/finder": ">=2.7 <4.0", - "symfony/yaml": ">=2.7 <4.0" + "symfony/browser-kit": ">=2.7 <5.0", + "symfony/console": ">=2.7 <5.0", + "symfony/css-selector": ">=2.7 <5.0", + "symfony/dom-crawler": ">=2.7 <5.0", + "symfony/event-dispatcher": ">=2.7 <5.0", + "symfony/finder": ">=2.7 <5.0", + "symfony/yaml": ">=2.7 <5.0" }, "require-dev": { "codeception/specify": "~0.3", "facebook/graph-sdk": "~5.3", "flow/jsonpath": "~0.2", - "league/factory-muffin": "^3.0", - "league/factory-muffin-faker": "^1.0", - "mongodb/mongodb": "^1.0", "monolog/monolog": "~1.8", "pda/pheanstalk": "~3.0", "php-amqplib/php-amqplib": "~2.4", "predis/predis": "^1.0", "squizlabs/php_codesniffer": "~2.0", + "symfony/process": ">=2.7 <5.0", "vlucas/phpdotenv": "^2.4.0" }, "suggest": { + "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module", + "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests", "codeception/specify": "BDD-style code blocks", "codeception/verify": "BDD-style assertions", "flow/jsonpath": "For using JSONPath in REST module", "league/factory-muffin": "For DataFactory module", "league/factory-muffin-faker": "For Faker support in DataFactory module", "phpseclib/phpseclib": "for SFTP option in FTP Module", + "stecman/symfony-console-completion": "For BASH autocompletion", "symfony/phpunit-bridge": "For phpunit-bridge support" }, "bin": [ @@ -158,34 +207,110 @@ "functional testing", "unit testing" ], - "time": "2017-05-11T21:07:05+00:00" + "time": "2018-03-31T22:30:43+00:00" }, { - "name": "composer/ca-bundle", - "version": "1.0.7", + "name": "codeception/phpunit-wrapper", + "version": "6.0.10", "source": { "type": "git", - "url": "https://github.com/composer/ca-bundle.git", - "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12" + "url": "https://github.com/Codeception/phpunit-wrapper.git", + "reference": "7057e599d97b02b4efb009681a43b327dbce138a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b17e6153cb7f33c7e44eb59578dc12eee5dc8e12", - "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7057e599d97b02b4efb009681a43b327dbce138a", + "reference": "7057e599d97b02b4efb009681a43b327dbce138a", + "shasum": "" + }, + "require": { + "phpunit/php-code-coverage": ">=2.2.4 <6.0", + "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0", + "sebastian/comparator": ">1.1 <3.0", + "sebastian/diff": ">=1.4 <4.0" + }, + "replace": { + "codeception/phpunit-wrapper": "*" + }, + "require-dev": { + "codeception/specify": "*", + "vlucas/phpdotenv": "^2.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\PHPUnit\\": "src\\" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Davert", + "email": "davert.php@resend.cc" + } + ], + "description": "PHPUnit classes used by Codeception", + "time": "2018-06-20T20:08:14+00:00" + }, + { + "name": "codeception/stub", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Stub.git", + "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805", + "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805", + "shasum": "" + }, + "require": { + "phpunit/phpunit-mock-objects": ">2.3 <7.0" + }, + "require-dev": { + "phpunit/phpunit": ">=4.8 <8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", + "time": "2018-05-17T09:31:08+00:00" + }, + { + "name": "composer/ca-bundle", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/f26a67e397be0e5c00d7c52ec7b5010098e15ce5", + "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.5", + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0" - }, - "suggest": { - "symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+" + "symfony/process": "^2.5 || ^3.0 || ^4.0" }, "type": "library", "extra": { @@ -217,38 +342,82 @@ "ssl", "tls" ], - "time": "2017-03-06T11:59:08+00:00" + "time": "2019-08-02T09:05:43+00:00" }, { "name": "consolidation/annotated-command", - "version": "2.4.8", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "6672ea38212f8bffb71fec7eadc8b3372154b17e" + "reference": "512a2e54c98f3af377589de76c43b24652bcb789" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/6672ea38212f8bffb71fec7eadc8b3372154b17e", - "reference": "6672ea38212f8bffb71fec7eadc8b3372154b17e", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789", + "reference": "512a2e54c98f3af377589de76c43b24652bcb789", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.1.5", - "php": ">=5.4.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "consolidation/output-formatters": "^3.4", + "php": ">=5.4.5", "psr/log": "^1", - "symfony/console": "^2.8|~3", - "symfony/event-dispatcher": "^2.5|^3", - "symfony/finder": "^2.5|^3" + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", + "phpunit/phpunit": "^6", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "2.x-dev" } @@ -269,33 +438,157 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2017-04-03T22:37:00+00:00" + "time": "2019-03-08T16:55:03+00:00" }, { - "name": "consolidation/log", - "version": "1.0.3", + "name": "consolidation/config", + "version": "1.2.1", "source": { "type": "git", - "url": "https://github.com/consolidation/log.git", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254" + "url": "https://github.com/consolidation/config.git", + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/74ba81b4edc585616747cc5c5309ce56fec41254", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254", + "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", "shasum": "" }, "require": { - "php": ">=5.5.0", - "psr/log": "~1.0", - "symfony/console": "~2.5|~3.0" + "dflydev/dot-access-data": "^1.1.0", + "grasmash/expander": "^1", + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "4.*", - "squizlabs/php_codesniffer": "2.*" + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", + "phpunit/phpunit": "^5", + "squizlabs/php_codesniffer": "2.*", + "symfony/console": "^2.5|^3|^4", + "symfony/yaml": "^2.8.11|^3|^4" + }, + "suggest": { + "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require-dev": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require-dev": { + "symfony/console": "^2.8", + "symfony/event-dispatcher": "^2.8", + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Consolidation\\Config\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + } + ], + "description": "Provide configuration services for a commandline tool.", + "time": "2019-03-03T19:37:04+00:00" + }, + { + "name": "consolidation/log", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/consolidation/log.git", + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "shasum": "" + }, + "require": { + "php": ">=5.4.5", + "psr/log": "^1.0", + "symfony/console": "^2.8|^3|^4" + }, + "require-dev": { + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^2" + }, + "type": "library", + "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -316,35 +609,87 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2016-03-23T23:46:42+00:00" + "time": "2019-01-01T17:30:51+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.1.9", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "2e09069866bae89d3fb545365f997a40745e34d2" + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/2e09069866bae89d3fb545365f997a40745e34d2", - "reference": "2e09069866bae89d3fb545365f997a40745e34d2", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605", + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605", "shasum": "" }, "require": { + "dflydev/dot-access-data": "^1.1.0", "php": ">=5.4.0", - "symfony/console": "^2.8|~3", - "symfony/finder": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", + "phpunit/phpunit": "^5.7.27", "squizlabs/php_codesniffer": "^2.7", + "symfony/var-dumper": "^2.8|^3|^4", "victorjonsson/markdowndocs": "^1.3" }, + "suggest": { + "symfony/var-dumper": "For using the var_dump formatter" + }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^6" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony3": { + "require": { + "symfony/console": "^3.4", + "symfony/finder": "^3.4", + "symfony/var-dumper": "^3.4" + }, + "config": { + "platform": { + "php": "5.6.32" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + } + }, "branch-alias": { "dev-master": "3.x-dev" } @@ -365,52 +710,58 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2017-05-08T15:59:33+00:00" + "time": "2019-05-30T23:16:01+00:00" }, { "name": "consolidation/robo", - "version": "1.0.5", + "version": "1.4.10", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "d06450370e8e303ebd1495dfc956f4c6c1b9dd01" + "reference": "e5a6ca64cf1324151873672e484aceb21f365681" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/d06450370e8e303ebd1495dfc956f4c6c1b9dd01", - "reference": "d06450370e8e303ebd1495dfc956f4c6c1b9dd01", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/e5a6ca64cf1324151873672e484aceb21f365681", + "reference": "e5a6ca64cf1324151873672e484aceb21f365681", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.2", + "consolidation/annotated-command": "^2.10.2", + "consolidation/config": "^1.2", "consolidation/log": "~1", - "consolidation/output-formatters": "^3.1.5", + "consolidation/output-formatters": "^3.1.13", + "consolidation/self-update": "^1", + "grasmash/yaml-expander": "^1.3", "league/container": "^2.2", "php": ">=5.5.0", - "symfony/console": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.5|~3.0", - "symfony/filesystem": "~2.5|~3.0", - "symfony/finder": "~2.5|~3.0", - "symfony/process": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/filesystem": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4", + "symfony/process": "^2.5|^3|^4" }, "replace": { "codegyre/robo": "< 1.0" }, "require-dev": { - "codeception/aspect-mock": "~1", - "codeception/base": "^2.2.6", + "codeception/aspect-mock": "^1|^2.1.1", + "codeception/base": "^2.3.7", "codeception/verify": "^0.3.2", - "henrikbjorn/lurker": "~1", - "natxet/cssmin": "~3", + "g1a/composer-test-scenarios": "^3", + "goaop/framework": "~2.1.2", + "goaop/parser-reflection": "^1.1.0", + "natxet/cssmin": "3.0.4", + "nikic/php-parser": "^3.1.5", "patchwork/jsqueeze": "~2", - "pear/archive_tar": "^1.4.2", + "pear/archive_tar": "^1.4.4", + "php-coveralls/php-coveralls": "^1", "phpunit/php-code-coverage": "~2|~4", - "satooshi/php-coveralls": "~1", - "squizlabs/php_codesniffer": "~2" + "squizlabs/php_codesniffer": "^2.8" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", - "natxet/CssMin": "For minifying JS files in taskMinify", + "natxet/CssMin": "For minifying CSS files in taskMinify", "patchwork/jsqueeze": "For minifying JS files in taskMinify", "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively." }, @@ -419,14 +770,39 @@ ], "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "remove": [ + "goaop/framework" + ], + "config": { + "platform": { + "php": "5.5.9" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + } + }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { - "classmap": [ - "scripts/composer/ScriptHandler.php" - ], "psr-4": { "Robo\\": "src" } @@ -442,7 +818,57 @@ } ], "description": "Modern task runner", - "time": "2016-11-24T02:07:48+00:00" + "time": "2019-07-29T15:40:50+00:00" + }, + { + "name": "consolidation/self-update", + "version": "1.1.5", + "source": { + "type": "git", + "url": "https://github.com/consolidation/self-update.git", + "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54", + "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54", + "shasum": "" + }, + "require": { + "php": ">=5.5.0", + "symfony/console": "^2.8|^3|^4", + "symfony/filesystem": "^2.5|^3|^4" + }, + "bin": [ + "scripts/release" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "SelfUpdate\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + }, + { + "name": "Alexander Menk", + "email": "menk@mestrona.net" + } + ], + "description": "Provides a self:update command for Symfony Console applications.", + "time": "2018-10-28T01:52:03+00:00" }, { "name": "container-interop/container-interop", @@ -475,6 +901,65 @@ "homepage": "https://github.com/container-interop/container-interop", "time": "2017-02-14T19:40:03+00:00" }, + { + "name": "dflydev/dot-access-data", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/dflydev/dflydev-dot-access-data.git", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Dflydev\\DotAccessData": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dragonfly Development Inc.", + "email": "info@dflydev.com", + "homepage": "http://dflydev.com" + }, + { + "name": "Beau Simensen", + "email": "beau@dflydev.com", + "homepage": "http://beausimensen.com" + }, + { + "name": "Carlos Frutos", + "email": "carlos@kiwing.it", + "homepage": "https://github.com/cfrutos" + } + ], + "description": "Given a deep data structure, access data by dot notation.", + "homepage": "https://github.com/dflydev/dflydev-dot-access-data", + "keywords": [ + "access", + "data", + "dot", + "notation" + ], + "time": "2017-01-20T21:14:22+00:00" + }, { "name": "doctrine/instantiator", "version": "1.0.5", @@ -583,29 +1068,31 @@ }, { "name": "fzaninotto/faker", - "version": "v1.6.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123" + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", "shasum": "" }, "require": { - "php": "^5.3.3|^7.0" + "php": "^5.3.3 || ^7.0" }, "require-dev": { "ext-intl": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" + "phpunit/phpunit": "^4.8.35 || ^5.7", + "squizlabs/php_codesniffer": "^1.5" }, "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "1.8-dev" + } }, "autoload": { "psr-4": { @@ -627,20 +1114,208 @@ "faker", "fixtures" ], - "time": "2016-04-29T12:21:54+00:00" + "time": "2018-07-12T10:23:15+00:00" }, { - "name": "guzzlehttp/guzzle", - "version": "6.2.3", + "name": "grasmash/expander", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006" + "url": "https://github.com/grasmash/expander.git", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006", + "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.4" + }, + "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4|^5.5.4", + "satooshi/php-coveralls": "^1.0.2|dev-master", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\Expander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in PHP arrays file.", + "time": "2017-12-21T22:14:55+00:00" + }, + { + "name": "grasmash/yaml-expander", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/grasmash/yaml-expander.git", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.4", + "symfony/yaml": "^2.8.11|^3|^4" + }, + "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4.8|^5.5.4", + "satooshi/php-coveralls": "^1.0.2|dev-master", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\YamlExpander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in a yaml file.", + "time": "2017-12-16T16:06:03+00:00" + }, + { + "name": "guzzle/guzzle", + "version": "v3.8.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": ">=2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "*", + "monolog/monolog": "1.*", + "phpunit/phpunit": "3.7.*", + "psr/log": "1.0.*", + "symfony/class-loader": "*", + "zendframework/zend-cache": "<2.3", + "zendframework/zend-log": "<2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.8-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "abandoned": "guzzlehttp/guzzle", + "time": "2014-01-28T22:29:15+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "6.3.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "shasum": "" }, "require": { @@ -650,13 +1325,16 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", "psr/log": "^1.0" }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.2-dev" + "dev-master": "6.3-dev" } }, "autoload": { @@ -689,7 +1367,7 @@ "rest", "web service" ], - "time": "2017-02-28T22:50:30+00:00" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -744,32 +1422,37 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.2", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + "reference": "239400de7a173fe9901b9ac7c06497751f00727a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0" + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + }, + "suggest": { + "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -799,13 +1482,14 @@ "keywords": [ "http", "message", + "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2019-07-01T23:21:34+00:00" }, { "name": "ircmaxell/password-compat", @@ -901,17 +1585,66 @@ "time": "2017-01-08T06:44:16+00:00" }, { - "name": "joomla-projects/jorobo", - "version": "0.6.4", + "name": "joomla-projects/joomla-testing-robo", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/joomla-projects/jorobo.git", - "reference": "119dd2f3e0b741601b37fa452c1d4ddf201c62af" + "url": "https://github.com/joomla-projects/joomla-testing-robo.git", + "reference": "6d459ea7c3293b907e59429e077dea1367658f68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/119dd2f3e0b741601b37fa452c1d4ddf201c62af", - "reference": "119dd2f3e0b741601b37fa452c1d4ddf201c62af", + "url": "https://api.github.com/repos/joomla-projects/joomla-testing-robo/zipball/6d459ea7c3293b907e59429e077dea1367658f68", + "reference": "6d459ea7c3293b907e59429e077dea1367658f68", + "shasum": "" + }, + "require": { + "cloudinary/cloudinary_php": "~1", + "consolidation/robo": "~1", + "knplabs/github-api": "~1", + "php": ">=5.4.0", + "squizlabs/php_codesniffer": "~1" + }, + "replace": { + "joomla-projects/robo": "< 1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Joomla\\Testing\\Robo\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Tito Alvarez", + "email": "tito.alvarez@community.joomla.org" + } + ], + "description": "Joomla automated testing swiss knife", + "keywords": [ + "qa", + "robo", + "task", + "tests" + ], + "time": "2016-12-14T20:43:15+00:00" + }, + { + "name": "joomla-projects/jorobo", + "version": "0.7.0", + "source": { + "type": "git", + "url": "https://github.com/joomla-projects/jorobo.git", + "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/1386f7712e39f08a3c1722e514eebdd6d0580c62", + "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62", "shasum": "" }, "require": { @@ -948,49 +1681,7 @@ } ], "description": "Tools and Tasks based on Robo.li for Joomla Extension Development and Releases", - "time": "2017-03-15T23:28:44+00:00" - }, - { - "name": "joomla-projects/robo", - "version": "0.1.0", - "source": { - "type": "git", - "url": "https://github.com/joomla-projects/robo.git", - "reference": "8a9c72f61696a4f288ede8212a0e7c7c47eda360" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/robo/zipball/8a9c72f61696a4f288ede8212a0e7c7c47eda360", - "reference": "8a9c72f61696a4f288ede8212a0e7c7c47eda360", - "shasum": "" - }, - "require": { - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "joomla_projects\\robo\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Javier", - "email": "javier.gomez@community.joomla.org" - } - ], - "description": "Robo tasks for Joomla Quality Assurance", - "keywords": [ - "BDD", - "robo", - "task" - ], - "abandoned": "joomla-projects/joomla-testing-robo", - "time": "2015-08-07T16:24:43+00:00" + "time": "2017-08-24T01:24:32+00:00" }, { "name": "joomla-projects/selenium-server-standalone", @@ -1071,27 +1762,27 @@ }, { "name": "joomla/github", - "version": "1.5.3", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/github-api.git", - "reference": "5f4198716973309d9b91cf0ab5b5b6b02dbb21ce" + "reference": "61580350250930083c42a24dc6a7873b28e606c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/github-api/zipball/5f4198716973309d9b91cf0ab5b5b6b02dbb21ce", - "reference": "5f4198716973309d9b91cf0ab5b5b6b02dbb21ce", + "url": "https://api.github.com/repos/joomla-framework/github-api/zipball/61580350250930083c42a24dc6a7873b28e606c1", + "reference": "61580350250930083c42a24dc6a7873b28e606c1", "shasum": "" }, "require": { - "joomla/http": "^1.2.2", - "joomla/registry": "~1.0", - "joomla/uri": "~1.0", + "joomla/http": "~1.3|~2.0", + "joomla/registry": "^1.4.5|~2.0", + "joomla/uri": "~1.0|~2.0", "php": "^5.3.10|~7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "1.*" + "joomla/coding-standards": "~2.0@alpha", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0" }, "type": "joomla-package", "extra": { @@ -1106,7 +1797,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla Github Package", "homepage": "https://github.com/joomla-framework/github-api", @@ -1115,31 +1806,31 @@ "github", "joomla" ], - "time": "2017-01-28T23:18:16+00:00" + "time": "2018-06-30T20:05:34+00:00" }, { "name": "joomla/http", - "version": "1.3.0", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/joomla-framework/http.git", - "reference": "51caeb5c5c83f9379b88d347b6a9cc53f27683de" + "reference": "128c3d410fd7327fb87839cd3e00ed0be2f71f9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/http/zipball/51caeb5c5c83f9379b88d347b6a9cc53f27683de", - "reference": "51caeb5c5c83f9379b88d347b6a9cc53f27683de", + "url": "https://api.github.com/repos/joomla-framework/http/zipball/128c3d410fd7327fb87839cd3e00ed0be2f71f9d", + "reference": "128c3d410fd7327fb87839cd3e00ed0be2f71f9d", "shasum": "" }, "require": { "composer/ca-bundle": "~1.0", - "joomla/uri": "~1.0", + "joomla/uri": "~1.0|~2.0", "php": "^5.3.10|~7.0" }, "require-dev": { + "joomla/coding-standards": "~2.0@alpha", "joomla/test": "~1.0", - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "1.*" + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0" }, "suggest": { "ext-curl": "To use cURL for HTTP connections", @@ -1158,7 +1849,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla HTTP Package", "homepage": "https://github.com/joomla-framework/http", @@ -1167,33 +1858,33 @@ "http", "joomla" ], - "time": "2016-09-26T10:03:36+00:00" + "time": "2019-03-10T15:31:03+00:00" }, { "name": "joomla/registry", - "version": "1.5.2", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/joomla-framework/registry.git", - "reference": "bd3592c6f0554a72811df52aeaea98c7815f6e5a" + "reference": "182eed3a56b2b7e14cef11fdbc63c253ddcfd924" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/registry/zipball/bd3592c6f0554a72811df52aeaea98c7815f6e5a", - "reference": "bd3592c6f0554a72811df52aeaea98c7815f6e5a", + "url": "https://api.github.com/repos/joomla-framework/registry/zipball/182eed3a56b2b7e14cef11fdbc63c253ddcfd924", + "reference": "182eed3a56b2b7e14cef11fdbc63c253ddcfd924", "shasum": "" }, "require": { "joomla/compat": "~1.0", - "joomla/utilities": "~1.0", - "php": ">=5.3.10|>=7.0", + "joomla/utilities": "^1.4.1|~2.0", + "php": "^5.3.10|~7.0", "symfony/polyfill-php55": "~1.0" }, "require-dev": { + "joomla/coding-standards": "~2.0@alpha", "joomla/test": "~1.0", - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "1.*", - "symfony/yaml": "~2.0|~3.0" + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0", + "symfony/yaml": "~2.0|~3.0|~4.0" }, "suggest": { "symfony/yaml": "Install symfony/yaml if you require YAML support." @@ -1211,7 +1902,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla Registry Package", "homepage": "https://github.com/joomla-framework/registry", @@ -1220,29 +1911,29 @@ "joomla", "registry" ], - "time": "2016-05-14T20:42:05+00:00" + "time": "2018-06-06T16:48:30+00:00" }, { "name": "joomla/string", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/joomla-framework/string.git", - "reference": "66363d317e6c020f30a70265c129281c77c43ca0" + "reference": "64ed484157262578b8daddb488bb9bd3552bc4fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/string/zipball/66363d317e6c020f30a70265c129281c77c43ca0", - "reference": "66363d317e6c020f30a70265c129281c77c43ca0", + "url": "https://api.github.com/repos/joomla-framework/string/zipball/64ed484157262578b8daddb488bb9bd3552bc4fe", + "reference": "64ed484157262578b8daddb488bb9bd3552bc4fe", "shasum": "" }, "require": { "php": "^5.3.10|~7.0" }, "require-dev": { + "joomla/coding-standards": "~2.0@alpha", "joomla/test": "~1.0", - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "1.*" + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0" }, "suggest": { "ext-mbstring": "For improved processing" @@ -1277,7 +1968,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla String Package", "homepage": "https://github.com/joomla-framework/string", @@ -1286,35 +1977,44 @@ "joomla", "string" ], - "time": "2016-12-10T18:13:42+00:00" + "time": "2019-06-16T18:18:09+00:00" }, { "name": "joomla/uri", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/uri.git", - "reference": "980e532e4235bb8f1ada15b28822abbeb171da3f" + "reference": "848a31dc895a9c8c9d7ea67571d6a4dd634a9dc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/uri/zipball/980e532e4235bb8f1ada15b28822abbeb171da3f", - "reference": "980e532e4235bb8f1ada15b28822abbeb171da3f", + "url": "https://api.github.com/repos/joomla-framework/uri/zipball/848a31dc895a9c8c9d7ea67571d6a4dd634a9dc1", + "reference": "848a31dc895a9c8c9d7ea67571d6a4dd634a9dc1", "shasum": "" }, "require": { - "php": ">=5.3.10" + "php": "^5.3.10|~7.0" + }, + "require-dev": { + "joomla/coding-standards": "~2.0@alpha", + "joomla/test": "~1.0", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0" }, "type": "joomla-package", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { "psr-4": { - "Joomla\\Uri\\": "src/", - "Joomla\\Uri\\Tests\\": "Tests/" + "Joomla\\Uri\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla Uri Package", "homepage": "https://github.com/joomla-framework/uri", @@ -1323,29 +2023,29 @@ "joomla", "uri" ], - "time": "2014-02-09T02:57:17+00:00" + "time": "2018-07-01T00:12:15+00:00" }, { "name": "joomla/utilities", - "version": "1.4.1", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/joomla-framework/utilities.git", - "reference": "8913ca02aad7b929e0d52d78fd5a6961070bdbc6" + "reference": "b54beb07ddf2d8074f6f8f43c365f84ddf714c8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/8913ca02aad7b929e0d52d78fd5a6961070bdbc6", - "reference": "8913ca02aad7b929e0d52d78fd5a6961070bdbc6", + "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/b54beb07ddf2d8074f6f8f43c365f84ddf714c8f", + "reference": "b54beb07ddf2d8074f6f8f43c365f84ddf714c8f", "shasum": "" }, "require": { - "joomla/string": "~1.3", + "joomla/string": "~1.3|~2.0", "php": "^5.3.10|~7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "1.*" + "joomla/coding-standards": "~2.0@alpha", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0" }, "type": "joomla-package", "extra": { @@ -1360,7 +2060,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla Utilities Package", "homepage": "https://github.com/joomla-framework/utilities", @@ -1369,7 +2069,69 @@ "joomla", "utilities" ], - "time": "2016-12-10T17:09:33+00:00" + "time": "2019-07-17T01:48:57+00:00" + }, + { + "name": "knplabs/github-api", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/php-github-api.git", + "reference": "98d0bcd2c4c96a40ded9081f8f6289907f73823c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/98d0bcd2c4c96a40ded9081f8f6289907f73823c", + "reference": "98d0bcd2c4c96a40ded9081f8f6289907f73823c", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "guzzle/guzzle": "~3.7", + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "sllh/php-cs-fixer-styleci-bridge": "~1.3" + }, + "suggest": { + "knplabs/gaufrette": "Needed for optional Gaufrette cache" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8.x-dev" + } + }, + "autoload": { + "psr-4": { + "Github\\": "lib/Github/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Thibault Duplessis", + "email": "thibault.duplessis@gmail.com", + "homepage": "http://ornicar.github.com" + }, + { + "name": "KnpLabs Team", + "homepage": "http://knplabs.com" + } + ], + "description": "GitHub API v3 client", + "homepage": "https://github.com/KnpLabs/php-github-api", + "keywords": [ + "api", + "gh", + "gist", + "github" + ], + "time": "2016-07-26T08:49:38+00:00" }, { "name": "league/container", @@ -1438,16 +2200,16 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "shasum": "" }, "require": { @@ -1488,26 +2250,26 @@ "reflection", "static analysis" ], - "time": "2015-12-27T11:43:31+00:00" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.3.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -1533,24 +2295,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" + "time": "2017-08-08T06:39:58+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -1580,42 +2342,42 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-06-03T08:32:36+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "sebastian/comparator": "^1.1|^2.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { - "psr-0": { - "Prophecy\\": "src/" + "psr-4": { + "Prophecy\\": "src/Prophecy" } }, "notification-url": "https://packagist.org/downloads/", @@ -1643,7 +2405,7 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2019-06-13T12:50:23+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1709,16 +2471,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -1742,8 +2504,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "role": "lead", + "email": "sb@sebastian-bergmann.de" } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", @@ -1752,7 +2514,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -1846,16 +2608,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.11", + "version": "1.4.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", "shasum": "" }, "require": { @@ -1891,20 +2653,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27T10:12:30+00:00" + "time": "2017-12-04T08:55:13+00:00" }, { "name": "phpunit/phpunit", - "version": "4.8.35", + "version": "4.8.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87" + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87", - "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", "shasum": "" }, "require": { @@ -1952,8 +2714,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "The PHP Unit Testing framework.", @@ -1963,7 +2725,7 @@ "testing", "xunit" ], - "time": "2017-02-06T05:18:07+00:00" + "time": "2017-06-21T08:07:12+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -2019,6 +2781,7 @@ "mock", "xunit" ], + "abandoned": true, "time": "2015-10-02T06:51:40+00:00" }, { @@ -2122,16 +2885,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -2165,7 +2928,47 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7.0", + "satooshi/php-coveralls": ">=1.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2016-02-11T07:05:27+00:00" }, { "name": "sebastian/comparator", @@ -2233,23 +3036,23 @@ }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -2281,7 +3084,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08T07:14:41+00:00" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -2614,72 +3417,27 @@ ], "time": "2014-12-04T22:32:15+00:00" }, - { - "name": "stecman/symfony-console-completion", - "version": "0.7.0", - "source": { - "type": "git", - "url": "https://github.com/stecman/symfony-console-completion.git", - "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/5461d43e53092b3d3b9dbd9d999f2054730f4bbb", - "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/console": "~2.3 || ~3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Stecman\\Component\\Symfony\\Console\\BashCompletion\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Stephen Holdaway", - "email": "stephen@stecman.co.nz" - } - ], - "description": "Automatic BASH completion for Symfony Console Component based applications.", - "time": "2016-02-24T05:08:54+00:00" - }, { "name": "symfony/browser-kit", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57" + "reference": "53266c9a1536e2dc673eb1efb6a6142ef84c6282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9fab1ab6f77b77f3df5fc5250fc6956811699b57", - "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/53266c9a1536e2dc673eb1efb6a6142ef84c6282", + "reference": "53266c9a1536e2dc673eb1efb6a6142ef84c6282", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/dom-crawler": "~2.8|~3.0" + "php": "^5.5.9|>=7.0.8", + "symfony/dom-crawler": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/process": "" @@ -2687,7 +3445,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2714,43 +3472,52 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2019-06-09T14:27:26+00:00" }, { "name": "symfony/console", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38" + "reference": "12940f20a816c978860fa4925b3f1bbb27e9ac46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38", - "reference": "a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38", + "url": "https://api.github.com/repos/symfony/console/zipball/12940f20a816c978860fa4925b3f1bbb27e9ac46", + "reference": "12940f20a816c978860fa4925b3f1bbb27e9ac46", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/debug": "~2.8|~3.0", + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2777,29 +3544,29 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-04-26T01:39:17+00:00" + "time": "2019-07-24T14:46:41+00:00" }, { "name": "symfony/css-selector", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "02983c144038e697c959e6b06ef6666de759ccbc" + "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/02983c144038e697c959e6b06ef6666de759ccbc", - "reference": "02983c144038e697c959e6b06ef6666de759ccbc", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/8ca29297c29b64fb3a1a135e71cb25f67f9fdccf", + "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2815,14 +3582,14 @@ "MIT" ], "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" @@ -2830,37 +3597,36 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2019-01-16T09:39:14+00:00" }, { "name": "symfony/debug", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686" + "reference": "bc977cb2681d75988ab2d53d14c4245c6c04f82f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fd6eeee656a5a7b384d56f1072243fe1c0e81686", - "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686", + "url": "https://api.github.com/repos/symfony/debug/zipball/bc977cb2681d75988ab2d53d14c4245c6c04f82f", + "reference": "bc977cb2681d75988ab2d53d14c4245c6c04f82f", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2887,28 +3653,29 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-04-19T20:17:50+00:00" + "time": "2019-07-23T08:39:19+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286" + "reference": "adb96e63af6fb0cc721cc69861001d60d0133d0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f1ad34e8af09ed17570e027cf0c58a12eddec286", - "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/adb96e63af6fb0cc721cc69861001d60d0133d0c", + "reference": "adb96e63af6fb0cc721cc69861001d60d0133d0c", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0" + "symfony/css-selector": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/css-selector": "" @@ -2916,7 +3683,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2943,31 +3710,34 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2019-05-30T15:47:52+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b8a401f733b43251e1d088c589368b2a94155e40" + "reference": "f18fdd6cc7006441865e698420cee26bac94741f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b8a401f733b43251e1d088c589368b2a94155e40", - "reference": "b8a401f733b43251e1d088c589368b2a94155e40", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f18fdd6cc7006441865e698420cee26bac94741f", + "reference": "f18fdd6cc7006441865e698420cee26bac94741f", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" + }, + "conflict": { + "symfony/dependency-injection": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -2976,7 +3746,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3003,29 +3773,30 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:58:48+00:00" + "time": "2019-06-25T07:45:31+00:00" }, { "name": "symfony/filesystem", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "040651db13cf061827a460cc10f6e36a445c45b4" + "reference": "70adda061ef83bb7def63a17953dc41f203308a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/040651db13cf061827a460cc10f6e36a445c45b4", - "reference": "040651db13cf061827a460cc10f6e36a445c45b4", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/70adda061ef83bb7def63a17953dc41f203308a7", + "reference": "70adda061ef83bb7def63a17953dc41f203308a7", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3052,29 +3823,29 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2019-06-23T09:29:17+00:00" }, { "name": "symfony/finder", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9cf076f8f492f4b1ffac40aae9c2d287b4ca6930" + "reference": "1e762fdf73ace6ceb42ba5a6ca280be86082364a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9cf076f8f492f4b1ffac40aae9c2d287b4ca6930", - "reference": "9cf076f8f492f4b1ffac40aae9c2d287b4ca6930", + "url": "https://api.github.com/repos/symfony/finder/zipball/1e762fdf73ace6ceb42ba5a6ca280be86082364a", + "reference": "1e762fdf73ace6ceb42ba5a6ca280be86082364a", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3101,20 +3872,78 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2019-06-28T08:02:59+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.3.0", + "name": "symfony/polyfill-ctype", + "version": "v1.12.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "550ebaac289296ce228a706d0867afc34687e3f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", + "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.12-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2019-08-06T08:03:45+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.12.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -3126,7 +3955,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3160,20 +3989,20 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-php55", - "version": "v1.3.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "03e3f0350bca2220e3623a0e340eef194405fc67" + "reference": "548bb39407e78e54f785b4e18c7e0d5d9e493265" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67", - "reference": "03e3f0350bca2220e3623a0e340eef194405fc67", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/548bb39407e78e54f785b4e18c7e0d5d9e493265", + "reference": "548bb39407e78e54f785b4e18c7e0d5d9e493265", "shasum": "" }, "require": { @@ -3183,7 +4012,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3216,29 +4045,29 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/process", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0" + "reference": "d129c017e8602507688ef2c3007951a16c1a8407" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", - "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", + "url": "https://api.github.com/repos/symfony/process/zipball/d129c017e8602507688ef2c3007951a16c1a8407", + "reference": "d129c017e8602507688ef2c3007951a16c1a8407", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3265,27 +4094,31 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2019-05-30T15:47:52+00:00" }, { "name": "symfony/yaml", - "version": "v3.2.8", + "version": "v3.4.30", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6" + "reference": "051d045c684148060ebfc9affb7e3f5e0899d40b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/acec26fcf7f3031e094e910b94b002fa53d4e4d6", - "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6", + "url": "https://api.github.com/repos/symfony/yaml/zipball/051d045c684148060ebfc9affb7e3f5e0899d40b", + "reference": "051d045c684148060ebfc9affb7e3f5e0899d40b", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -3293,7 +4126,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3320,24 +4153,25 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2019-07-24T13:01:31+00:00" }, { "name": "webmozart/assert", - "version": "1.2.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -3370,7 +4204,7 @@ "check", "validate" ], - "time": "2016-11-23T20:04:58+00:00" + "time": "2018-12-25T11:19:39+00:00" } ], "aliases": [], @@ -3379,7 +4213,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.3.10" + "php": ">=5.4" }, "platform-dev": [], "platform-overrides": { From 98d9d2125502aa4ad628bfe3fff6be190d527426 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Sat, 10 Aug 2019 20:30:19 +0100 Subject: [PATCH 06/69] Prepare for release version 3.7.0 --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..0708095 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ +# Changelog + +#### 3.7.0 + +* Use correct database *2019-08-10* +* Move to namespaces *2019-08-10* +* First imageignores image float setting366 *2019-08-10* +* Changed language strings so that the parameter "image float" in the config is more concrete *2019-08-10* +* Improved the Batch view of com_weblinks *2019-08-10* +* add Jorobo Map Task To RoboFile *2019-08-10* +* makeSameAliasPossibleForDifferentLanguages *2019-08-10* +* mapping of new media files was not correct because of this you see the warning "JInstaller: :Install: File does not exist /var/www/html/weblinksecht/weblinks/tests/joomla/tmp/media/js" while installing *2019-08-10* +* Delete jed_update.xml *2019-08-10* +* xml code-style *2019-08-10* +* typo *2019-08-10* +* Serve updates through the downloads site *2019-08-10* +* Implementing full associations for single weblink *2019-08-10* +* Update composer *2019-08-10* From 44b1683d18301f640a096803c7c7b74ac7b2e801 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Sat, 10 Aug 2019 20:32:28 +0100 Subject: [PATCH 07/69] Prepare for release version 3.7.0 --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0708095..db24a53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,3 +16,17 @@ * Serve updates through the downloads site *2019-08-10* * Implementing full associations for single weblink *2019-08-10* * Update composer *2019-08-10* +* Use correct database *2019-08-10* +* Move to namespaces *2019-08-10* +* First imageignores image float setting366 *2019-08-10* +* Changed language strings so that the parameter "image float" in the config is more concrete *2019-08-10* +* Improved the Batch view of com_weblinks *2019-08-10* +* add Jorobo Map Task To RoboFile *2019-08-10* +* makeSameAliasPossibleForDifferentLanguages *2019-08-10* +* mapping of new media files was not correct because of this you see the warning "JInstaller: :Install: File does not exist /var/www/html/weblinksecht/weblinks/tests/joomla/tmp/media/js" while installing *2019-08-10* +* Delete jed_update.xml *2019-08-10* +* xml code-style *2019-08-10* +* typo *2019-08-10* +* Serve updates through the downloads site *2019-08-10* +* Implementing full associations for single weblink *2019-08-10* +* Update composer *2019-08-10* From 685435e87d40fefca1878e220215383e650bb3f3 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Mon, 12 Aug 2019 18:43:07 +0100 Subject: [PATCH 08/69] Rework xvfb Following https://docs.travis-ci.com/user/gui-and-headless-browsers/#using-services as default travis moved to Xenial from trusty since they last passed --- .travis.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7fe808b..139a39c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,20 @@ matrix: fast_finish: true include: - php: 5.5 + dist: trusty - php: 5.6 env: RUN_PHPCS="yes" + services: + - xvfb - php: 7.0 sudo: true addons: - firefox: "47.0.1" + firefox: '47.0.1' + services: + - xvfb - php: 7.1 + services: + - xvfb - php: hhvm sudo: true dist: trusty @@ -29,6 +36,7 @@ matrix: services: - mysql - postgresql + - xvfb allow_failures: - php: hhvm @@ -48,10 +56,10 @@ before_script: - sudo sed -e "s?%PHPVERSION%?${TRAVIS_PHP_VERSION:0:1}?g" --in-place /etc/apache2/sites-available/default - git submodule update --init --recursive - sudo service apache2 restart -# Xvfb -- "export DISPLAY=:99.0" -- "sh -e /etc/init.d/xvfb start" -- sleep 3 # give xvfb some time to start +# Xvfb on trusty environments (PHP 5.5 and below) +- if [[ $dist == "trusty" ]]; then export DISPLAY=:99.0; fi +- if [[ $dist == "trusty" ]]; then sh -e /etc/init.d/xvfb start; fi +- if [[ $dist == "trusty" ]]; then sleep 3 ; fi # give xvfb some time to start # Fluxbox - sudo apt-get install fluxbox -y --force-yes - fluxbox & From 683168e8e43b10e34c70f6557a9b9c4c53f8f86e Mon Sep 17 00:00:00 2001 From: wilsonge Date: Mon, 12 Aug 2019 18:59:36 +0100 Subject: [PATCH 09/69] Fix reference to old selenium task --- RoboFile.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/RoboFile.php b/RoboFile.php index 30b6275..4386438 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -444,23 +444,18 @@ class RoboFile extends \Robo\Tasks */ public function runSelenium() { - if (!$this->isWindows()) - { - $this->_exec("vendor/bin/selenium-server-standalone " . $this->getWebDriver() . ' >> selenium.log 2>&1 &'); - } - else - { - $this->_exec('START java.exe -jar' . $this->getWebDriver() . - ' vendor\joomla-projects\selenium-server-standalone\bin\selenium-server-standalone.jar '); - } - if ($this->isWindows()) { + // TODO: Move this logic to the selenium standalone server task in the parent joomla repo + $this->_exec('START java.exe -jar' . $this->getWebDriver() . + ' vendor\joomla-projects\selenium-server-standalone\bin\selenium-server-standalone.jar '); sleep(3); } else { - $this->taskWaitForSeleniumStandaloneServer() + $this->taskSeleniumStandaloneServer() + ->runSelenium() + ->waitForSelenium() ->run() ->stopOnFail(); } From 5fbb9634da8f1e18ababd09ee322040309f55e8a Mon Sep 17 00:00:00 2001 From: wilsonge Date: Mon, 12 Aug 2019 19:29:40 +0100 Subject: [PATCH 10/69] Fix the strict standards issues by bumping base jrobo tasks version --- composer.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index b8ee76d..ba3972b 100644 --- a/composer.lock +++ b/composer.lock @@ -1635,16 +1635,16 @@ }, { "name": "joomla-projects/jorobo", - "version": "0.7.0", + "version": "0.7.1", "source": { "type": "git", "url": "https://github.com/joomla-projects/jorobo.git", - "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62" + "reference": "ebcbd0eae3b9f2dfcca35d86ba442c88c942bc52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/1386f7712e39f08a3c1722e514eebdd6d0580c62", - "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62", + "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/ebcbd0eae3b9f2dfcca35d86ba442c88c942bc52", + "reference": "ebcbd0eae3b9f2dfcca35d86ba442c88c942bc52", "shasum": "" }, "require": { @@ -1671,17 +1671,17 @@ "name": "Yves Hoppe", "email": "yves@compojoom.com" }, - { - "name": "Niels Braczek", - "email": "nbraczek@bsds.de" - }, { "name": "Niels Nübel", "email": "niels@niels-nuebel.de" + }, + { + "name": "Niels Braczek", + "email": "nbraczek@bsds.de" } ], "description": "Tools and Tasks based on Robo.li for Joomla Extension Development and Releases", - "time": "2017-08-24T01:24:32+00:00" + "time": "2019-08-12T18:25:30+00:00" }, { "name": "joomla-projects/selenium-server-standalone", From fed4615abd7302b5cd413963fbf11257383872f6 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Mon, 12 Aug 2019 21:16:25 +0100 Subject: [PATCH 11/69] Update testing robo + use setWebdriver method now exposed --- RoboFile.php | 1 + composer.lock | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RoboFile.php b/RoboFile.php index 4386438..49006b2 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -454,6 +454,7 @@ class RoboFile extends \Robo\Tasks else { $this->taskSeleniumStandaloneServer() + ->setWebdriver($this->getWebdriver()) ->runSelenium() ->waitForSelenium() ->run() diff --git a/composer.lock b/composer.lock index ba3972b..757cbd0 100644 --- a/composer.lock +++ b/composer.lock @@ -1586,16 +1586,16 @@ }, { "name": "joomla-projects/joomla-testing-robo", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/joomla-projects/joomla-testing-robo.git", - "reference": "6d459ea7c3293b907e59429e077dea1367658f68" + "reference": "1b4b15df677ed3e9b5557c8ac057f710f58cfd3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/joomla-testing-robo/zipball/6d459ea7c3293b907e59429e077dea1367658f68", - "reference": "6d459ea7c3293b907e59429e077dea1367658f68", + "url": "https://api.github.com/repos/joomla-projects/joomla-testing-robo/zipball/1b4b15df677ed3e9b5557c8ac057f710f58cfd3b", + "reference": "1b4b15df677ed3e9b5557c8ac057f710f58cfd3b", "shasum": "" }, "require": { @@ -1631,7 +1631,7 @@ "task", "tests" ], - "time": "2016-12-14T20:43:15+00:00" + "time": "2019-08-12T19:33:12+00:00" }, { "name": "joomla-projects/jorobo", From df58b4c93c0b3a7f7de6fc8e67d570c0bddd1b8a Mon Sep 17 00:00:00 2001 From: wilsonge Date: Mon, 12 Aug 2019 21:19:14 +0100 Subject: [PATCH 12/69] Bump selenium driver version and firefox version used in php7 --- .travis.yml | 2 +- codeception.yml | 16 +++++++--------- composer.json | 2 +- composer.lock | 23 ++++++++++++++++------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 139a39c..f64a3e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: - php: 7.0 sudo: true addons: - firefox: '47.0.1' + firefox: 'latest-esr' services: - xvfb - php: 7.1 diff --git a/codeception.yml b/codeception.yml index 362549c..2d07f65 100644 --- a/codeception.yml +++ b/codeception.yml @@ -10,16 +10,14 @@ settings: memory_limit: 1024M webdrivers: firefox: - windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\gecko\geckodriver64.exe - mac: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/gecko/geckodriver_mac - linux: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/gecko/geckodriver_linux_64 + windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\gecko\windows\geckodriver64.exe + mac: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/gecko/mac/geckodriver + linux: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/gecko/linux/geckodriver chrome: - windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\chrome\chromedriver.exe - mac: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/chrome/chromedriver_mac - linux: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/chrome/chromedriver_linux_64 + windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\chrome\windows\chromedriver.exe + mac: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/chrome/mac/chromedriver + linux: vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/chrome/linux/chromedriver internet explorer: windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\internet-explorer32\IEDriverServer.exe MicrosoftEdge: - windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\edge\MicrosoftWebDriver.exe - MicrosoftEdgeInsiders: - windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\edge-insiders\MicrosoftWebDriver.exe + windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\edge\msedgedriver64.exe diff --git a/composer.json b/composer.json index aa42700..bf1416a 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "joomla-projects/joomla-browser": "v3.6.5.1", "consolidation/robo": "^1.0.0", "joomla-projects/joomla-testing-robo": "~1.0", - "joomla-projects/selenium-server-standalone": "v3.1.0", + "joomla-projects/selenium-server-standalone": "^v3.1.0", "fzaninotto/faker": "^1.6", "joomla-projects/jorobo": "~0.7", "behat/gherkin": "^4.4.1" diff --git a/composer.lock b/composer.lock index 757cbd0..98cd9e1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8e471a057bb2ecb11e1f699032d7c341", + "content-hash": "cfeab8e38688fc8318fdfac739483533", "packages": [], "packages-dev": [ { @@ -1685,27 +1685,36 @@ }, { "name": "joomla-projects/selenium-server-standalone", - "version": "v3.1.0", + "version": "3.141.59", "source": { "type": "git", "url": "https://github.com/joomla-projects/selenium-server-standalone.git", - "reference": "cc928a73f0dfb900793dec48b18e08e8dfcbbaa7" + "reference": "2a2310b540344169d52e3d517d3f1d1b4d0b9f4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/selenium-server-standalone/zipball/cc928a73f0dfb900793dec48b18e08e8dfcbbaa7", - "reference": "cc928a73f0dfb900793dec48b18e08e8dfcbbaa7", + "url": "https://api.github.com/repos/joomla-projects/selenium-server-standalone/zipball/2a2310b540344169d52e3d517d3f1d1b4d0b9f4f", + "reference": "2a2310b540344169d52e3d517d3f1d1b4d0b9f4f", "shasum": "" }, "bin": [ "bin/selenium-server-standalone" ], "type": "library", + "autoload": { + "files": [ + "Selenium.php" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache 2.0" + "Apache-2.0" ], "authors": [ + { + "name": "Puneet Kala", + "email": "puneet.kala@community.joomla.org" + }, { "name": "Sven Eisenschmidt", "email": "sven.eisenschmidt@gmail.com" @@ -1721,7 +1730,7 @@ "selenium", "testing" ], - "time": "2017-02-21T15:10:31+00:00" + "time": "2019-07-31T05:15:24+00:00" }, { "name": "joomla/compat", From 68c634976f9088ad233b154eb68ad565537c7a61 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Mon, 12 Aug 2019 22:57:35 +0100 Subject: [PATCH 13/69] Remove HHVM, add PHP 7.2, 7.3 --- .travis.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index f64a3e2..77df567 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,22 +23,12 @@ matrix: - php: 7.1 services: - xvfb - - php: hhvm - sudo: true - dist: trusty - group: edge # Until the next stable image update sometime after 2016-12-01 - addons: - apt: - packages: - - mysql-server-5.6 - - mysql-client-core-5.6 - - mysql-client-5.6 + - php: 7.2 + services: + - xvfb + - php: 7.3 services: - - mysql - - postgresql - xvfb - allow_failures: - - php: hhvm before_script: # Forcing localhost in hosts file From a96ef51de440ca87e9981727f43a584b03599416 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Mon, 12 Aug 2019 23:56:17 +0100 Subject: [PATCH 14/69] Update the Joomla Browser version to the latest version --- composer.json | 2 +- composer.lock | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index bf1416a..22aaa99 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "require-dev": { "codeception/codeception": "^2.2", - "joomla-projects/joomla-browser": "v3.6.5.1", + "joomla-projects/joomla-browser": "v3.9.0", "consolidation/robo": "^1.0.0", "joomla-projects/joomla-testing-robo": "~1.0", "joomla-projects/selenium-server-standalone": "^v3.1.0", diff --git a/composer.lock b/composer.lock index 98cd9e1..4092a1a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cfeab8e38688fc8318fdfac739483533", + "content-hash": "d3915c7584f2f0e9fa16886c3fbfd2a9", "packages": [], "packages-dev": [ { @@ -1535,24 +1535,30 @@ }, { "name": "joomla-projects/joomla-browser", - "version": "v3.6.5.1", + "version": "v3.9.0", "source": { "type": "git", "url": "https://github.com/joomla-projects/joomla-browser.git", - "reference": "833e113544dc05b34ef024b0634f17c69f95be42" + "reference": "b3099f181ce79b0dedd92dc14cf03388bb6c6c67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/833e113544dc05b34ef024b0634f17c69f95be42", - "reference": "833e113544dc05b34ef024b0634f17c69f95be42", + "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/b3099f181ce79b0dedd92dc14cf03388bb6c6c67", + "reference": "b3099f181ce79b0dedd92dc14cf03388bb6c6c67", "shasum": "" }, "require": { - "consolidation/robo": "~1", - "php": ">=5.5.9" + "consolidation/robo": "^1", + "php": ">=5.5.9", + "symfony/console": "~3|~4", + "symfony/filesystem": "~3|~4", + "symfony/finder": "~3|~4", + "symfony/process": "~3|~4", + "symfony/yaml": "~3|~4" }, "require-dev": { - "joomla-projects/joomla-testing-robo": "~1.0" + "codeception/codeception": "~2.4", + "joomla-projects/joomla-testing-robo": "dev-container-test" }, "type": "library", "autoload": { @@ -1570,7 +1576,7 @@ "email": "puneet.kala@community.joomla.org" }, { - "name": "Javier Gómez", + "name": "Javier Gomez", "email": "javier.gomez@community.joomla.org" } ], @@ -1582,7 +1588,7 @@ "acceptance testing", "joomla" ], - "time": "2017-01-08T06:44:16+00:00" + "time": "2018-11-01T13:11:06+00:00" }, { "name": "joomla-projects/joomla-testing-robo", From 0716d5e3e624071ff5da1619d15d8f6318e8c42c Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 00:15:35 +0100 Subject: [PATCH 15/69] Fix code style errors in project --- src/administrator/components/com_weblinks/tables/weblink.php | 3 ++- src/administrator/manifests/packages/weblinks/script.php | 2 -- src/components/com_weblinks/models/weblink.php | 4 ++-- src/plugins/system/weblinks/weblinks.php | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/administrator/components/com_weblinks/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php index a4963fb..f81d4c0 100644 --- a/src/administrator/components/com_weblinks/tables/weblink.php +++ b/src/administrator/components/com_weblinks/tables/weblink.php @@ -93,7 +93,8 @@ class WeblinksTableWeblink extends JTable // Verify that the alias is unique $table = JTable::getInstance('Weblink', 'WeblinksTable', array('dbo' => $this->getDbo())); - if ($table->load(array('language' => $this->language, 'alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0)) + if ($table->load(array('language' => $this->language, 'alias' => $this->alias, 'catid' => $this->catid)) + && ($table->id != $this->id || $this->id == 0)) { $this->setError(JText::_('COM_WEBLINKS_ERROR_UNIQUE_ALIAS')); diff --git a/src/administrator/manifests/packages/weblinks/script.php b/src/administrator/manifests/packages/weblinks/script.php index cfb312b..e9a8179 100644 --- a/src/administrator/manifests/packages/weblinks/script.php +++ b/src/administrator/manifests/packages/weblinks/script.php @@ -19,8 +19,6 @@ class Pkg_WeblinksInstallerScript extends JInstallerScript /** * Extension script constructor. * - * @return void - * * @since __DEPLOY_VERSION__ */ public function __construct() diff --git a/src/components/com_weblinks/models/weblink.php b/src/components/com_weblinks/models/weblink.php index 688e303..3c6ce13 100644 --- a/src/components/com_weblinks/models/weblink.php +++ b/src/components/com_weblinks/models/weblink.php @@ -63,7 +63,7 @@ class WeblinksModelWeblink extends JModelItem /** * Method to get an object. * - * @param integer $id The id of the object to get. + * @param integer $pk The id of the object to get. * * @return mixed Object on success, false on failure. */ @@ -191,7 +191,7 @@ class WeblinksModelWeblink extends JModelItem /** * Method to increment the hit counter for the weblink * - * @param integer $id Optional ID of the weblink. + * @param integer $pk Optional ID of the weblink. * * @return boolean True on success */ diff --git a/src/plugins/system/weblinks/weblinks.php b/src/plugins/system/weblinks/weblinks.php index 27e5da4..ef3f33a 100644 --- a/src/plugins/system/weblinks/weblinks.php +++ b/src/plugins/system/weblinks/weblinks.php @@ -38,7 +38,7 @@ class PlgSystemWeblinks extends JPlugin /** * Method to add statistics information to Administrator control panel. * - * @param string $extension The extension requesting information. + * @param string $extension The extension requesting information. * * @return array containing statistical information. * From 8712d4033a1453f858a78004ab1ed5d185c60409 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 01:31:05 +0100 Subject: [PATCH 16/69] Upgrade drone file to docker image + drone 1. Requires signature --- .drone.yml | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index 456f65d..053116b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,20 +1,30 @@ -cache: - mount: - - vendor - - .git -build: - image: yveshoppe/joomla-systemtests:latest - commands: - - chmod a+x .drone/build.sh - - ./.drone/build.sh - - apache2ctl start - - service mysql start - - cd /tests/www - - export DISPLAY=:0 - - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 & - - sleep 3 - - fluxbox > /dev/null 2>&1 & - - vendor/bin/robo run:tests - clone: - depth: 1 - path: repo +--- +kind: pipeline +name: default + +steps: + - name: weblinks-codeception-tests + image: joomlaprojects/docker-systemtests:latest + commands: + - composer install + - chmod a+x .drone/build.sh + - ./.drone/build.sh + - apache2ctl start + - service mysql start + - cd /tests/www + - export DISPLAY=:0 + - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 & + - sleep 3 + - fluxbox > /dev/null 2>&1 & + - vendor/bin/robo run:tests + +volumes: + - name: weblinks_cache + host: + path: /tmp/weblinks_cache + +--- +kind: signature +hmac: 41c9d399a788c8e97a0444ee8483682cfcb5b21d920b4012852a48ed3b2e9db8 + +... From 3b155af6e923e896fdd204d85b6bc3b6f50696c6 Mon Sep 17 00:00:00 2001 From: Jelle Kok Date: Tue, 13 Aug 2019 04:18:48 +0200 Subject: [PATCH 17/69] codestyle + fix windows webdriver load --- RoboFile.php | 51 ++++++++++----------- tests/_support/Step/Acceptance/category.php | 9 ++-- tests/_support/Step/Acceptance/weblink.php | 9 ++-- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/RoboFile.php b/RoboFile.php index 49006b2..437083b 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -12,6 +12,9 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\Testing\Robo\Tasks\loadTasks; +use Robo\Tasks; + require_once 'vendor/autoload.php'; if (!defined('JPATH_BASE')) @@ -26,11 +29,11 @@ if (!defined('JPATH_BASE')) * * @since 1.0 */ -class RoboFile extends \Robo\Tasks +class RoboFile extends Tasks { // Load tasks from composer, see composer.json - use \Joomla\Testing\Robo\Tasks\loadTasks; - use \Joomla\Jorobo\Tasks\loadTasks; + use loadTasks; + use Joomla\Jorobo\Tasks\loadTasks; /** * File extension for executables @@ -77,22 +80,13 @@ class RoboFile extends \Robo\Tasks /** * Get the executable extension according to Operating System * - * @return void + * @return string */ private function getExecutableExtension() { if ($this->isWindows()) { - // Check whether git.exe or git as command should be used, - // As on window both is possible - if (!$this->_exec('git.exe --version')->getMessage()) - { - return ''; - } - else - { - return '.exe'; - } + return '.exe'; } return ''; @@ -102,10 +96,11 @@ class RoboFile extends \Robo\Tasks * Executes all the Selenium System Tests in a suite on your machine * * @param array $opts Array of configuration options: - * - 'use-htaccess': renames and enable embedded Joomla .htaccess file - * - 'env': set a specific environment to get configuration from + * - 'use-htaccess': renames and enable embedded Joomla .htaccess file + * - 'env': set a specific environment to get configuration from * * @return mixed + * @throws \Codeception\Exception\ConfigurationException */ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop']) { @@ -166,6 +161,8 @@ class RoboFile extends \Robo\Tasks * @param string $suite Optional name of the suite containing the tests, Acceptance by default. * * @return mixed + * @throws ReflectionException + * @throws \Codeception\Exception\ConfigurationException */ public function runTest($pathToTestFile = null, $suite = 'acceptance') { @@ -205,8 +202,8 @@ class RoboFile extends \Robo\Tasks } $this->say(''); - $testNumber = $this->ask('Type the number of the test in the list that you want to run...'); - $test = $tests[$testNumber]; + $testNumber = $this->ask('Type the number of the test in the list that you want to run...'); + $test = $tests[$testNumber]; } $pathToTestFile = 'tests/' . $suite . '/' . $test; @@ -215,7 +212,7 @@ class RoboFile extends \Robo\Tasks require 'tests/' . $suite . '/' . $test; // Logic to fetch the class name from the file name - $fileName = explode("/", $test); + $fileName = explode("/", $test); $className = explode(".", $fileName[1]); // If the selected file is cest only than we will give the option to execute individual methods, we don't need this in cept file @@ -245,7 +242,7 @@ class RoboFile extends \Robo\Tasks $this->say(''); $methodNumber = $this->ask('Please choose the method in the test that you would want to run...'); - $method = $methods[$methodNumber]; + $method = $methods[$methodNumber]; } if (isset($method) && $method != 'All') @@ -441,20 +438,21 @@ class RoboFile extends \Robo\Tasks * Runs Selenium Standalone Server. * * @return void + * @throws \Codeception\Exception\ConfigurationException */ public function runSelenium() { if ($this->isWindows()) { // TODO: Move this logic to the selenium standalone server task in the parent joomla repo - $this->_exec('START java.exe -jar' . $this->getWebDriver() . - ' vendor\joomla-projects\selenium-server-standalone\bin\selenium-server-standalone.jar '); + $this->_exec('START java.exe -jar ' . $this->getWebDriver() . + ' .\\vendor\\joomla-projects\\selenium-server-standalone\\bin\\selenium-server-standalone.jar '); sleep(3); } else { $this->taskSeleniumStandaloneServer() - ->setWebdriver($this->getWebdriver()) + ->setWebdriver($this->getWebdriver()) ->runSelenium() ->waitForSelenium() ->run() @@ -585,6 +583,7 @@ class RoboFile extends \Robo\Tasks * @return string the webdriver string to use with selenium * * @since version + * @throws \Codeception\Exception\ConfigurationException */ public function getWebdriver() { @@ -623,8 +622,8 @@ class RoboFile extends \Robo\Tasks else { $this->yell( - print_r($codeceptMainConfig) . - 'No driver for your browser. Check your browser in acceptance.suite.yml and the webDrivers in codeception.yml'); + print_r($codeceptMainConfig) . + 'No driver for your browser. Check your browser in acceptance.suite.yml and the webDrivers in codeception.yml'); // We can't do anything without a driver, exit exit(1); @@ -695,9 +694,9 @@ class RoboFile extends \Robo\Tasks * * @param String $target The target joomla instance * + * @return void * @since __DEPLOY_VERSION__ * - * @return void */ public function map($target) { diff --git a/tests/_support/Step/Acceptance/category.php b/tests/_support/Step/Acceptance/category.php index 37d3311..c9cea4d 100644 --- a/tests/_support/Step/Acceptance/category.php +++ b/tests/_support/Step/Acceptance/category.php @@ -22,9 +22,10 @@ class category extends \AcceptanceTester /** * Function to create a Category in Joomla! * - * @param String $categoryName Name of the Category which is to be created + * @param String $categoryName Name of the Category which is to be created * * @return void + * @throws \Exception */ public function createCategory($categoryName) { @@ -47,9 +48,10 @@ class category extends \AcceptanceTester /** * Function to Trash a Category in Joomla! * - * @param String $categoryName Name of the category which is to be trashed + * @param String $categoryName Name of the category which is to be trashed * * @return void + * @throws \Exception */ public function trashCategory($categoryName) { @@ -66,9 +68,10 @@ class category extends \AcceptanceTester /** * Function to Delete a Category in Joomla! * - * @param String $categoryName Name of the category which is to be deleted + * @param String $categoryName Name of the category which is to be deleted * * @return void + * @throws \Exception */ public function deleteCategory($categoryName) { diff --git a/tests/_support/Step/Acceptance/weblink.php b/tests/_support/Step/Acceptance/weblink.php index 702d667..da1b9e0 100644 --- a/tests/_support/Step/Acceptance/weblink.php +++ b/tests/_support/Step/Acceptance/weblink.php @@ -16,10 +16,11 @@ class weblink extends \AcceptanceTester /** * Creates a weblink * - * @param string $title The title for the weblink - * @param string $url The url for the weblink - * @param string $countClicks If not null, we set the "Count Clicks" weblink property to the given value. + * @param string $title The title for the weblink + * @param string $url The url for the weblink + * @param string $countClicks If not null, we set the "Count Clicks" weblink property to the given value. * + * @throws \Exception */ public function createWeblink($title, $url, $countClicks = null) { @@ -75,4 +76,4 @@ class weblink extends \AcceptanceTester $I->waitForText('Web Links','30',['css' => 'h1']); $I->waitForText('1 web link successfully deleted.', 30, ['id' => 'system-message-container']); } -} \ No newline at end of file +} From b26c00c34d20821b0237b9ddd70c3c57c7dde78b Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 00:47:17 +0100 Subject: [PATCH 18/69] Test dropping php 5.5 and upgrading latest codeception --- .travis.yml | 18 +- composer.json | 7 +- composer.lock | 967 ++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 864 insertions(+), 128 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77df567..ee40100 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ sudo: true language: php +services: + - xvfb env: global: @@ -8,27 +10,15 @@ env: matrix: fast_finish: true include: - - php: 5.5 - dist: trusty - php: 5.6 env: RUN_PHPCS="yes" - services: - - xvfb - php: 7.0 sudo: true addons: firefox: 'latest-esr' - services: - - xvfb - php: 7.1 - services: - - xvfb - php: 7.2 - services: - - xvfb - php: 7.3 - services: - - xvfb before_script: # Forcing localhost in hosts file @@ -46,10 +36,6 @@ before_script: - sudo sed -e "s?%PHPVERSION%?${TRAVIS_PHP_VERSION:0:1}?g" --in-place /etc/apache2/sites-available/default - git submodule update --init --recursive - sudo service apache2 restart -# Xvfb on trusty environments (PHP 5.5 and below) -- if [[ $dist == "trusty" ]]; then export DISPLAY=:99.0; fi -- if [[ $dist == "trusty" ]]; then sh -e /etc/init.d/xvfb start; fi -- if [[ $dist == "trusty" ]]; then sleep 3 ; fi # give xvfb some time to start # Fluxbox - sudo apt-get install fluxbox -y --force-yes - fluxbox & diff --git a/composer.json b/composer.json index 22aaa99..8f1ce02 100644 --- a/composer.json +++ b/composer.json @@ -4,14 +4,15 @@ "license" : "GPL-2.0+", "config": { "platform": { - "php": "5.5.33" + "php": "5.6.0" } }, "require" : { - "php": ">=5.4" + "php": ">=5.6" }, "require-dev": { - "codeception/codeception": "^2.2", + "codeception/codeception": "^3", + "phpunit/phpunit": "^5.7.27", "joomla-projects/joomla-browser": "v3.9.0", "consolidation/robo": "^1.0.0", "joomla-projects/joomla-testing-robo": "~1.0", diff --git a/composer.lock b/composer.lock index 4092a1a..b344776 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d3915c7584f2f0e9fa16886c3fbfd2a9", + "content-hash": "9a5638b98ecd6f9c31fd98d2e464885d", "packages": [], "packages-dev": [ { @@ -120,28 +120,30 @@ }, { "name": "codeception/codeception", - "version": "2.4.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "bca3547632556875f1cdd567d6057cc14fe472b8" + "reference": "feb566a9dc26993611602011ae3834d8e3c1dd7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/bca3547632556875f1cdd567d6057cc14fe472b8", - "reference": "bca3547632556875f1cdd567d6057cc14fe472b8", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/feb566a9dc26993611602011ae3834d8e3c1dd7f", + "reference": "feb566a9dc26993611602011ae3834d8e3c1dd7f", "shasum": "" }, "require": { "behat/gherkin": "^4.4.0", - "codeception/phpunit-wrapper": "^6.0.9|^7.0.6", - "codeception/stub": "^1.0", + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3", + "codeception/stub": "^2.0", + "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "facebook/webdriver": ">=1.1.3 <2.0", - "guzzlehttp/guzzle": ">=4.1.4 <7.0", - "guzzlehttp/psr7": "~1.0", - "php": ">=5.4.0 <8.0", + "facebook/webdriver": "^1.6.0", + "guzzlehttp/guzzle": "^6.3.0", + "guzzlehttp/psr7": "~1.4", + "hoa/console": "~3.0", + "php": ">=5.6.0 <8.0", "symfony/browser-kit": ">=2.7 <5.0", "symfony/console": ">=2.7 <5.0", "symfony/css-selector": ">=2.7 <5.0", @@ -152,7 +154,8 @@ }, "require-dev": { "codeception/specify": "~0.3", - "facebook/graph-sdk": "~5.3", + "doctrine/annotations": "^1", + "doctrine/orm": "^2", "flow/jsonpath": "~0.2", "monolog/monolog": "~1.8", "pda/pheanstalk": "~3.0", @@ -160,7 +163,7 @@ "predis/predis": "^1.0", "squizlabs/php_codesniffer": "~2.0", "symfony/process": ">=2.7 <5.0", - "vlucas/phpdotenv": "^2.4.0" + "vlucas/phpdotenv": "^3.0" }, "suggest": { "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module", @@ -183,7 +186,7 @@ }, "autoload": { "psr-4": { - "Codeception\\": "src\\Codeception", + "Codeception\\": "src/Codeception", "Codeception\\Extension\\": "ext" } }, @@ -207,26 +210,26 @@ "functional testing", "unit testing" ], - "time": "2018-03-31T22:30:43+00:00" + "time": "2019-07-18T16:21:08+00:00" }, { "name": "codeception/phpunit-wrapper", - "version": "6.0.10", + "version": "6.0.16", "source": { "type": "git", "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "7057e599d97b02b4efb009681a43b327dbce138a" + "reference": "299e3aece31489ed962e6c39fe2fb6f3bbd2eb16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7057e599d97b02b4efb009681a43b327dbce138a", - "reference": "7057e599d97b02b4efb009681a43b327dbce138a", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/299e3aece31489ed962e6c39fe2fb6f3bbd2eb16", + "reference": "299e3aece31489ed962e6c39fe2fb6f3bbd2eb16", "shasum": "" }, "require": { - "phpunit/php-code-coverage": ">=2.2.4 <6.0", - "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0", - "sebastian/comparator": ">1.1 <3.0", + "phpunit/php-code-coverage": ">=4.0.4 <6.0", + "phpunit/phpunit": ">=5.7.27 <6.5.13", + "sebastian/comparator": ">=1.2.4 <3.0", "sebastian/diff": ">=1.4 <4.0" }, "replace": { @@ -234,7 +237,7 @@ }, "require-dev": { "codeception/specify": "*", - "vlucas/phpdotenv": "^2.4" + "vlucas/phpdotenv": "^3.0" }, "type": "library", "autoload": { @@ -253,27 +256,24 @@ } ], "description": "PHPUnit classes used by Codeception", - "time": "2018-06-20T20:08:14+00:00" + "time": "2019-02-26T20:47:56+00:00" }, { "name": "codeception/stub", - "version": "1.0.4", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/Codeception/Stub.git", - "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805" + "reference": "853657f988942f7afb69becf3fd0059f192c705a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805", - "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a", + "reference": "853657f988942f7afb69becf3fd0059f192c705a", "shasum": "" }, "require": { - "phpunit/phpunit-mock-objects": ">2.3 <7.0" - }, - "require-dev": { - "phpunit/phpunit": ">=4.8 <8.0" + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3" }, "type": "library", "autoload": { @@ -286,7 +286,7 @@ "MIT" ], "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", - "time": "2018-05-17T09:31:08+00:00" + "time": "2019-03-02T15:35:10+00:00" }, { "name": "composer/ca-bundle", @@ -1016,30 +1016,38 @@ }, { "name": "facebook/webdriver", - "version": "1.4.1", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/facebook/php-webdriver.git", - "reference": "eadb0b7a7c3e6578185197fd40158b08c3164c83" + "reference": "e43de70f3c7166169d0f14a374505392734160e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/eadb0b7a7c3e6578185197fd40158b08c3164c83", - "reference": "eadb0b7a7c3e6578185197fd40158b08c3164c83", + "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5", + "reference": "e43de70f3c7166169d0f14a374505392734160e5", "shasum": "" }, "require": { "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", "ext-zip": "*", - "php": "^5.5 || ~7.0", - "symfony/process": "^2.8 || ^3.1" + "php": "^5.6 || ~7.0", + "symfony/process": "^2.8 || ^3.1 || ^4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.0", + "jakub-onderka/php-parallel-lint": "^0.9.2", + "php-coveralls/php-coveralls": "^2.0", "php-mock/php-mock-phpunit": "^1.1", - "phpunit/phpunit": "4.6.* || ~5.0", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "^2.6" + "phpunit/phpunit": "^5.7", + "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0", + "squizlabs/php_codesniffer": "^2.6", + "symfony/var-dumper": "^3.3 || ^4.0" + }, + "suggest": { + "ext-SimpleXML": "For Firefox profile creation" }, "type": "library", "extra": { @@ -1064,7 +1072,7 @@ "selenium", "webdriver" ], - "time": "2017-04-28T14:54:49+00:00" + "time": "2019-06-13T08:02:18+00:00" }, { "name": "fzaninotto/faker", @@ -1491,6 +1499,555 @@ ], "time": "2019-07-01T23:21:34+00:00" }, + { + "name": "hoa/consistency", + "version": "1.17.05.02", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Consistency.git", + "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f", + "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f", + "shasum": "" + }, + "require": { + "hoa/exception": "~1.0", + "php": ">=5.5.0" + }, + "require-dev": { + "hoa/stream": "~1.0", + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Consistency\\": "." + }, + "files": [ + "Prelude.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Consistency library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "autoloader", + "callable", + "consistency", + "entity", + "flex", + "keyword", + "library" + ], + "time": "2017-05-02T12:18:12+00:00" + }, + { + "name": "hoa/console", + "version": "3.17.05.02", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Console.git", + "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Console/zipball/e231fd3ea70e6d773576ae78de0bdc1daf331a66", + "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0", + "hoa/exception": "~1.0", + "hoa/file": "~1.0", + "hoa/protocol": "~1.0", + "hoa/stream": "~1.0", + "hoa/ustring": "~4.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "suggest": { + "ext-pcntl": "To enable hoa://Event/Console/Window:resize.", + "hoa/dispatcher": "To use the console kit.", + "hoa/router": "To use the console kit." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Console\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Console library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "autocompletion", + "chrome", + "cli", + "console", + "cursor", + "getoption", + "library", + "option", + "parser", + "processus", + "readline", + "terminfo", + "tput", + "window" + ], + "time": "2017-05-02T12:26:19+00:00" + }, + { + "name": "hoa/event", + "version": "1.17.01.13", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Event.git", + "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54", + "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Event\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Event library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "event", + "library", + "listener", + "observer" + ], + "time": "2017-01-13T15:30:50+00:00" + }, + { + "name": "hoa/exception", + "version": "1.17.01.16", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Exception.git", + "reference": "091727d46420a3d7468ef0595651488bfc3a458f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f", + "reference": "091727d46420a3d7468ef0595651488bfc3a458f", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Exception\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Exception library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "exception", + "library" + ], + "time": "2017-01-16T07:53:27+00:00" + }, + { + "name": "hoa/file", + "version": "1.17.07.11", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/File.git", + "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", + "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0", + "hoa/exception": "~1.0", + "hoa/iterator": "~2.0", + "hoa/stream": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\File\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\File library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "Socket", + "directory", + "file", + "finder", + "library", + "link", + "temporary" + ], + "time": "2017-07-11T07:42:15+00:00" + }, + { + "name": "hoa/iterator", + "version": "2.17.01.10", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Iterator.git", + "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc", + "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Iterator\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Iterator library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "iterator", + "library" + ], + "time": "2017-01-10T10:34:47+00:00" + }, + { + "name": "hoa/protocol", + "version": "1.17.01.14", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Protocol.git", + "reference": "5c2cf972151c45f373230da170ea015deecf19e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2", + "reference": "5c2cf972151c45f373230da170ea015deecf19e2", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Protocol\\": "." + }, + "files": [ + "Wrapper.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Protocol library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "library", + "protocol", + "resource", + "stream", + "wrapper" + ], + "time": "2017-01-14T12:26:10+00:00" + }, + { + "name": "hoa/stream", + "version": "1.17.02.21", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Stream.git", + "reference": "3293cfffca2de10525df51436adf88a559151d82" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82", + "reference": "3293cfffca2de10525df51436adf88a559151d82", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0", + "hoa/exception": "~1.0", + "hoa/protocol": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Stream\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Stream library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "Context", + "bucket", + "composite", + "filter", + "in", + "library", + "out", + "protocol", + "stream", + "wrapper" + ], + "time": "2017-02-21T16:01:06+00:00" + }, + { + "name": "hoa/ustring", + "version": "4.17.01.16", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Ustring.git", + "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0", + "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "suggest": { + "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().", + "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Ustring\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Ustring library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "library", + "search", + "string", + "unicode" + ], + "time": "2017-01-16T07:08:25+00:00" + }, { "name": "ircmaxell/password-compat", "version": "v1.0.4", @@ -2213,6 +2770,51 @@ ], "time": "2017-05-10T09:20:27+00:00" }, + { + "name": "myclabs/deep-copy", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2017-10-19T19:58:43+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1", @@ -2424,39 +3026,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.2.4", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "^1.3.2", - "sebastian/version": "~1.0" + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", + "phpunit/php-token-stream": "^1.4.2 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0", + "sebastian/environment": "^1.3.2 || ^2.0", + "sebastian/version": "^1.0 || ^2.0" }, "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4" + "ext-xdebug": "^2.1.4", + "phpunit/phpunit": "^5.7" }, "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.2.1", - "ext-xmlwriter": "*" + "ext-xdebug": "^2.5.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -2471,8 +3074,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "role": "lead", + "email": "sb@sebastian-bergmann.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -2482,7 +3085,7 @@ "testing", "xunit" ], - "time": "2015-10-06T15:47:00+00:00" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2672,40 +3275,50 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.36", + "version": "5.7.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" + "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", + "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", "shasum": "" }, "require": { "ext-dom": "*", "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "~2.1", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.6.2", + "phpunit/php-code-coverage": "^4.0.4", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "~1.3", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.1|~3.0" + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "^1.2.4", + "sebastian/diff": "^1.4.3", + "sebastian/environment": "^1.3.4 || ^2.0", + "sebastian/exporter": "~2.0", + "sebastian/global-state": "^1.1", + "sebastian/object-enumerator": "~2.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "^1.0.6|^2.0.1", + "symfony/yaml": "~2.1|~3.0|~4.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, + "require-dev": { + "ext-pdo": "*" }, "suggest": { + "ext-xdebug": "*", "phpunit/php-invoker": "~1.1" }, "bin": [ @@ -2714,7 +3327,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.8.x-dev" + "dev-master": "5.7.x-dev" } }, "autoload": { @@ -2740,30 +3353,33 @@ "testing", "xunit" ], - "time": "2017-06-21T08:07:12+00:00" + "time": "2018-02-01T05:50:59+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.3.8", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", - "php": ">=5.3.3", - "phpunit/php-text-template": "~1.2", - "sebastian/exporter": "~1.2" + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2 || ^2.0" + }, + "conflict": { + "phpunit/phpunit": "<5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^5.4" }, "suggest": { "ext-soap": "*" @@ -2771,7 +3387,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "3.2.x-dev" } }, "autoload": { @@ -2797,7 +3413,7 @@ "xunit" ], "abandoned": true, - "time": "2015-10-02T06:51:40+00:00" + "time": "2017-06-30T09:13:00+00:00" }, { "name": "psr/container", @@ -2985,6 +3601,51 @@ "description": "A polyfill for getallheaders.", "time": "2016-02-11T07:05:27+00:00" }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04T06:30:41+00:00" + }, { "name": "sebastian/comparator", "version": "1.2.4", @@ -3153,21 +3814,21 @@ }, { "name": "sebastian/exporter", - "version": "1.2.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", "shasum": "" }, "require": { "php": ">=5.3.3", - "sebastian/recursion-context": "~1.0" + "sebastian/recursion-context": "~2.0" }, "require-dev": { "ext-mbstring": "*", @@ -3176,7 +3837,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3216,7 +3877,7 @@ "export", "exporter" ], - "time": "2016-06-17T09:04:28+00:00" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -3270,17 +3931,63 @@ "time": "2015-10-12T03:26:01+00:00" }, { - "name": "sebastian/recursion-context", - "version": "1.0.5", + "name": "sebastian/object-enumerator", + "version": "2.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7" + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "shasum": "" + }, + "require": { + "php": ">=5.6", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-02-18T15:18:39+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", "shasum": "" }, "require": { @@ -3292,7 +3999,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3320,7 +4027,49 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-10-03T07:41:43+00:00" + "time": "2016-11-19T07:33:16+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -4228,10 +4977,10 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.4" + "php": ">=5.6" }, "platform-dev": [], "platform-overrides": { - "php": "5.5.33" + "php": "5.6.0" } } From 0249510c728b8a8d448a9d64579899b672ca624b Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 00:57:20 +0100 Subject: [PATCH 19/69] Remove deprecated call --- tests/acceptance/_bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php index 3ea1d8c..aa9809f 100644 --- a/tests/acceptance/_bootstrap.php +++ b/tests/acceptance/_bootstrap.php @@ -1,4 +1,4 @@ Date: Tue, 13 Aug 2019 01:01:00 +0100 Subject: [PATCH 20/69] Update everything else just cause why not --- composer.lock | 80 ++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index b344776..8062efc 100644 --- a/composer.lock +++ b/composer.lock @@ -2871,22 +2871,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.2.2", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" + "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", + "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.3.0", + "php": "^5.6 || ^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -2912,20 +2912,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08T06:39:58+00:00" + "time": "2017-11-10T14:09:06+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.3.0", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { @@ -2959,7 +2959,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-06-03T08:32:36+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", @@ -3563,24 +3563,24 @@ }, { "name": "ralouphie/getallheaders", - "version": "2.0.5", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" + "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", "shasum": "" }, "require": { - "php": ">=5.3" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "~3.7.0", - "satooshi/php-coveralls": ">=1.0" + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" }, "type": "library", "autoload": { @@ -3599,7 +3599,7 @@ } ], "description": "A polyfill for getallheaders.", - "time": "2016-02-11T07:05:27+00:00" + "time": "2019-03-08T08:55:37+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -3764,28 +3764,28 @@ }, { "name": "sebastian/environment", - "version": "1.3.8", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", - "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8 || ^5.0" + "phpunit/phpunit": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3810,7 +3810,7 @@ "environment", "hhvm" ], - "time": "2016-08-18T05:49:44+00:00" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -4073,19 +4073,27 @@ }, { "name": "sebastian/version", - "version": "1.0.6", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", "shasum": "" }, + "require": { + "php": ">=5.6" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -4098,13 +4106,13 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21T13:59:46+00:00" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "squizlabs/php_codesniffer", From 45062c93401c7c60608fcec45a665c18f40feac6 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 20:35:30 +0100 Subject: [PATCH 21/69] Fix tests locally --- ...egories.administrator_Archive_Category.txt | 2 +- ...tegories.administrator_Create_Category.txt | 2 +- ...tegories.administrator_Delete_Category.txt | 2 +- ...egories.administrator_Publish_Category.txt | 2 +- ...ategories.administrator_Trash_Category.txt | 2 +- ...ories.administrator_Unpublish_Category.txt | 2 +- .../Acceptance/{category.php => Category.php} | 28 +------------------ .../Acceptance/{weblink.php => Weblink.php} | 2 +- tests/acceptance/_bootstrap.php | 1 - .../AdministratorCategoriesCest.php | 28 ++++++++++--------- .../AdministratorSmartSearchCest.php | 18 ++++++------ .../AdministratorWeblinksCest.php | 8 ++++-- 12 files changed, 37 insertions(+), 60 deletions(-) rename tests/_support/Step/Acceptance/{category.php => Category.php} (64%) rename tests/_support/Step/Acceptance/{weblink.php => Weblink.php} (98%) diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt index 5cec2e5..7f5abc5 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt @@ -11,5 +11,5 @@ I am going to "try to archive a weblink category" I click toolbar button "archive" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after Archiving the category" -I see "1 category successfully archived."," ['id' => 'system-message-container']" +I see "1 category archived."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt index df3e828..c4eeb31 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt @@ -13,5 +13,5 @@ I wait for text "Category Manager: Add A New Weblinks Category"," '60"," ['css' I fill field "['id' => 'jform_title']"," $this->categoryTitle" I click toolbar button "Save & Close" I expect to "see a success message after saving the category" -I see "Category successfully saved"," ['id' => 'system-message-container']" +I see "Category saved"," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt index 0e5a115..bb97207 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt @@ -12,5 +12,5 @@ I am going to "try to delete a Weblinks Category" I click toolbar button "Empty trash" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after Deleting the category" -I see "1 category successfully deleted."," ['id' => 'system-message-container']" +I see "1 category deleted."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt index 588ec38..d477650 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt @@ -11,5 +11,5 @@ I am going to "try to publish a Weblinks Category" I click toolbar button "publish" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after publishing the category" -I see "1 category successfully published."," ['id' => 'system-message-container']" +I see "1 category published."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt index 085c31e..75c4579 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt @@ -12,5 +12,5 @@ I am going to "try to delete a Weblinks Category" I click toolbar button "Trash" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after Trashing the category" -I see "1 category successfully trashed."," ['id' => 'system-message-container']" +I see "1 category trashed."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt index 976c45e..fe7a9d6 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt @@ -11,5 +11,5 @@ I am going to "try to unpublish a Weblinks Category" I click toolbar button "unpublish" I wait for element "['id' => 'system-message-container']"," '60" I expect to "See a success message after unpublishing the category" -I see "1 category successfully unpublished"," ['id' => 'system-message-container']" +I see "1 category unpublished"," ['id' => 'system-message-container']" diff --git a/tests/_support/Step/Acceptance/category.php b/tests/_support/Step/Acceptance/Category.php similarity index 64% rename from tests/_support/Step/Acceptance/category.php rename to tests/_support/Step/Acceptance/Category.php index c9cea4d..e0fedc4 100644 --- a/tests/_support/Step/Acceptance/category.php +++ b/tests/_support/Step/Acceptance/Category.php @@ -17,34 +17,8 @@ namespace Step\Acceptance; * * @since 1.4 */ -class category extends \AcceptanceTester +class Category extends \AcceptanceTester { - /** - * Function to create a Category in Joomla! - * - * @param String $categoryName Name of the Category which is to be created - * - * @return void - * @throws \Exception - */ - public function createCategory($categoryName) - { - $I = $this; - $I->am('Administrator'); - $I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks'); - $I->waitForText('Weblinks: Categories', '30', ['css' => 'h1']); - $I->expectTo('see categories page'); - $I->checkForPhpNoticesOrWarnings(); - - $I->amGoingTo('try to save a category with a filled title'); - $I->clickToolbarButton('New'); - $I->waitForText('Weblinks: New Category', '30', ['css' => 'h1']); - $I->fillField(['id' => 'jform_title'], $categoryName); - $I->clickToolbarButton('Save & Close'); - $I->expectTo('see a success message after saving the category'); - $I->see('Category successfully saved', ['id' => 'system-message-container']); - } - /** * Function to Trash a Category in Joomla! * diff --git a/tests/_support/Step/Acceptance/weblink.php b/tests/_support/Step/Acceptance/Weblink.php similarity index 98% rename from tests/_support/Step/Acceptance/weblink.php rename to tests/_support/Step/Acceptance/Weblink.php index da1b9e0..10ad10a 100644 --- a/tests/_support/Step/Acceptance/weblink.php +++ b/tests/_support/Step/Acceptance/Weblink.php @@ -11,7 +11,7 @@ namespace Step\Acceptance; * @package Step\Acceptance * @link http://codeception.com/docs/06-ReusingTestCode#StepObjects */ -class weblink extends \AcceptanceTester +class Weblink extends \AcceptanceTester { /** * Creates a weblink diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php index aa9809f..5634ef5 100644 --- a/tests/acceptance/_bootstrap.php +++ b/tests/acceptance/_bootstrap.php @@ -1,4 +1,3 @@ see('Invalid field: Title', ['id' => 'system-message-container']); } - public function administratorCreateCategory(\Step\Acceptance\category $I) + public function administratorCreateCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('create a Category in /administrator/'); @@ -62,13 +64,13 @@ class AdministratorCategoriesCest $I->fillField(['id' => 'jform_title'], $this->categoryTitle); $I->clickToolbarButton('Save & Close'); $I->expectTo('see a success message after saving the category'); - $I->see('Category successfully saved', ['id' => 'system-message-container']); + $I->see('Category saved', ['id' => 'system-message-container']); } /** * @depends administratorCreateCategory */ - public function administratorPublishCategory(\Step\Acceptance\category $I) + public function administratorPublishCategory(Category $I) { $I->am('Administrator'); @@ -84,13 +86,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('publish'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after publishing the category'); - $I->see('1 category successfully published.', ['id' => 'system-message-container']); + $I->see('0 categories published.', ['id' => 'system-message-container']); } /** * @depends administratorPublishCategory */ - public function administratorUnpublishCategory(\Step\Acceptance\category $I) + public function administratorUnpublishCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Unpublish a Category in /administrator/'); @@ -105,13 +107,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('unpublish'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('See a success message after unpublishing the category'); - $I->see('1 category successfully unpublished', ['id' => 'system-message-container']); + $I->see('1 category unpublished', ['id' => 'system-message-container']); } /** * @depends administratorUnpublishCategory */ - public function administratorArchiveCategory(\Step\Acceptance\category $I) + public function administratorArchiveCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Archiving a Category in /administrator/'); @@ -126,13 +128,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('archive'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after Archiving the category'); - $I->see('1 category successfully archived.', ['id' => 'system-message-container']); + $I->see('1 category archived.', ['id' => 'system-message-container']); } /** * @depends administratorArchiveCategory */ - public function administratorTrashCategory(\Step\Acceptance\category $I) + public function administratorTrashCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Trashing a Category in /administrator/'); @@ -148,13 +150,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('Trash'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after Trashing the category'); - $I->see('1 category successfully trashed.', ['id' => 'system-message-container']); + $I->see('1 category trashed.', ['id' => 'system-message-container']); } /** * @depends administratorTrashCategory */ - public function administratorDeleteCategory(\Step\Acceptance\category $I) + public function administratorDeleteCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Deleting a Category in /administrator/'); @@ -171,10 +173,10 @@ class AdministratorCategoriesCest $I->acceptPopup(); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after Deleting the category'); - $I->see('1 category successfully deleted.', ['id' => 'system-message-container']); + $I->see('1 category deleted.', ['id' => 'system-message-container']); } - public function administratorVerifyAvailableTabs(\Step\Acceptance\category $I) + public function administratorVerifyAvailableTabs(Category $I) { $I->am('Administrator'); $I->wantToTest('Category Edit View Tabs'); diff --git a/tests/acceptance/administrator/AdministratorSmartSearchCest.php b/tests/acceptance/administrator/AdministratorSmartSearchCest.php index e43bb55..c5093e6 100644 --- a/tests/acceptance/administrator/AdministratorSmartSearchCest.php +++ b/tests/acceptance/administrator/AdministratorSmartSearchCest.php @@ -35,7 +35,7 @@ class AdministratorSmartSearchCest $I->clickToolbarButton('Save & Close'); $I->waitForText('Control Panel', 30, ['class'=> 'page-title']); $I->expectTo('see a success message after saving the configuration'); - $I->see('Configuration successfully saved', ['id' => 'system-message-container']); + $I->see('Configuration saved', ['id' => 'system-message-container']); } public function administratorEnableContentPlugin(\Step\Acceptance\weblink $I) @@ -53,8 +53,8 @@ class AdministratorSmartSearchCest $I->waitForText('Plugins: Content - Smart Search', 30, ['class'=> 'page-title']); $I->selectOptionInChosen('Status', 'Enabled'); $I->clickToolbarButton('save & close'); - $I->waitForText('Plugin successfully saved.', 30, ['id' => 'system-message-container']); - $I->see('Plugin successfully saved.', ['id' => 'system-message-container']); + $I->waitForText('Plugin saved.', 30, ['id' => 'system-message-container']); + $I->see('Plugin saved.', ['id' => 'system-message-container']); } /** @@ -74,8 +74,8 @@ class AdministratorSmartSearchCest $I->waitForText('Plugins: Smart Search - Web Links', 30, ['class'=> 'page-title']); $I->selectOptionInChosen('Status', 'Enabled'); $I->clickToolbarButton('save & close'); - $I->waitForText('Plugin successfully saved.', 30, ['id' => 'system-message-container']); - $I->see('Plugin successfully saved.', ['id' => 'system-message-container']); + $I->waitForText('Plugin saved.', 30, ['id' => 'system-message-container']); + $I->see('Plugin saved.', ['id' => 'system-message-container']); } /** @@ -95,8 +95,8 @@ class AdministratorSmartSearchCest $I->click('Clear Index'); $I->acceptPopup(); - $I->waitForText('All items have been successfully deleted', 30, ['class' => 'alert-message']); - $I->see('All items have been successfully deleted', ['class' => 'alert-message']); + $I->waitForText('All items have been deleted', 30, ['class' => 'alert-message']); + $I->see('All items have been deleted', ['class' => 'alert-message']); } public function administratorCreateWeblink(\Step\Acceptance\weblink $I, $scenario) @@ -145,7 +145,7 @@ class AdministratorSmartSearchCest $I->waitForElement(['link' => 'Content - Smart Search']); $I->checkOption(['id' => 'cb0']); $I->clickToolbarButton('Unpublish'); // Note: The button is called "Disable", but we need to call it "Unpublish" here. - $I->waitForText('Plugin successfully disabled', 30, ['class' => 'alert-message']); + $I->waitForText('Plugin disabled', 30, ['class' => 'alert-message']); } /** @@ -166,7 +166,7 @@ class AdministratorSmartSearchCest $I->waitForElement(['link' => 'Smart Search - Web Links']); $I->checkOption(['id' => 'cb0']); $I->clickToolbarButton('Unpublish'); // Note: The button is called "Disable", but we need to call it "Unpublish" here. - $I->waitForText('Plugin successfully disabled', 30, ['class' => 'alert-message']); + $I->waitForText('Plugin disabled', 30, ['class' => 'alert-message']); } public function cleanUp(\Step\Acceptance\weblink $I, $scenario) diff --git a/tests/acceptance/administrator/AdministratorWeblinksCest.php b/tests/acceptance/administrator/AdministratorWeblinksCest.php index f9f2175..e5b10d7 100644 --- a/tests/acceptance/administrator/AdministratorWeblinksCest.php +++ b/tests/acceptance/administrator/AdministratorWeblinksCest.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Step\Acceptance\Weblink; + /** * Acceptance cest object class for admin steps * @@ -37,7 +39,7 @@ class AdministratorWeblinksCest * * @return void */ - public function administratorVerifyAvailableTabs(\Step\Acceptance\weblink $I) + public function administratorVerifyAvailableTabs(Weblink $I) { $I->am('Administrator'); $I->wantToTest('Weblinks Edit View Tabs'); @@ -49,7 +51,7 @@ class AdministratorWeblinksCest $I->waitForText('Web Links', '30', ['css' => 'h1']); $I->clickToolbarButton('New'); $I->waitForText('Web Link: New', '30', ['css' => 'h1']); - $I->verifyAvailableTabs(['New Web Link', 'Images', 'Publishing', 'Options', 'Metadata']); + $I->verifyAvailableTabs(['New Web Link', 'Images', 'Publishing', 'Options']); } /** @@ -61,7 +63,7 @@ class AdministratorWeblinksCest * * @return void */ - public function administratorCreateWeblink(\Step\Acceptance\weblink $I) + public function administratorCreateWeblink(Weblink $I) { $I->am('Administrator'); $I->wantToTest('Weblink creation in /administrator/'); From 5aa2f2fde62242ace1ace9c72b257a67f6a3f7d4 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 20:58:00 +0100 Subject: [PATCH 22/69] More intuitive names for traits --- RoboFile.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/RoboFile.php b/RoboFile.php index 437083b..750ecbb 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -12,7 +12,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -use Joomla\Testing\Robo\Tasks\loadTasks; +use Joomla\Jorobo\Tasks\loadTasks as loadReleaseTasks; +use Joomla\Testing\Robo\Tasks\loadTasks as loadTestingTasks; use Robo\Tasks; require_once 'vendor/autoload.php'; @@ -32,8 +33,8 @@ if (!defined('JPATH_BASE')) class RoboFile extends Tasks { // Load tasks from composer, see composer.json - use loadTasks; - use Joomla\Jorobo\Tasks\loadTasks; + use loadTestingTasks; + use loadReleaseTasks; /** * File extension for executables From c477abd151530a3beba658c596de1c9bd4746ac8 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 21:01:37 +0100 Subject: [PATCH 23/69] Different PHP requirements for dev vs stable --- composer.json | 3 ++- composer.lock | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 8f1ce02..ba46131 100644 --- a/composer.json +++ b/composer.json @@ -8,9 +8,10 @@ } }, "require" : { - "php": ">=5.6" + "php": ">=5.4" }, "require-dev": { + "php": ">=5.6", "codeception/codeception": "^3", "phpunit/phpunit": "^5.7.27", "joomla-projects/joomla-browser": "v3.9.0", diff --git a/composer.lock b/composer.lock index 8062efc..124a027 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9a5638b98ecd6f9c31fd98d2e464885d", + "content-hash": "1b0489cad34d1fd663da3e41426498d1", "packages": [], "packages-dev": [ { @@ -4985,9 +4985,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { + "php": ">=5.4" + }, + "platform-dev": { "php": ">=5.6" }, - "platform-dev": [], "platform-overrides": { "php": "5.6.0" } From 20b335d9185bd7bd08008e7c8833a33e454a2033 Mon Sep 17 00:00:00 2001 From: David Jardin Date: Wed, 14 Aug 2019 00:46:59 +0200 Subject: [PATCH 24/69] Replace require_once call with Autoloader (#404) Allows the usage of a custom IndexerAdapter class using a JLoader override --- src/plugins/finder/weblinks/weblinks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/finder/weblinks/weblinks.php b/src/plugins/finder/weblinks/weblinks.php index 32de240..8dc5306 100644 --- a/src/plugins/finder/weblinks/weblinks.php +++ b/src/plugins/finder/weblinks/weblinks.php @@ -12,7 +12,7 @@ defined('JPATH_BASE') or die; use Joomla\Registry\Registry; // Load the base adapter. -require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'; +JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'); /** * Smart Search adapter for Joomla Web Links. From 22df3bff56ffa177d339a76b2716fc1e2386123d Mon Sep 17 00:00:00 2001 From: wilsonge Date: Wed, 14 Aug 2019 00:24:46 +0100 Subject: [PATCH 25/69] Proxy the kill selenium task to the library --- RoboFile.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/RoboFile.php b/RoboFile.php index 750ecbb..dd85b57 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -493,7 +493,12 @@ class RoboFile extends Tasks public function killSelenium($host = 'localhost', $port = '4444') { $this->say('Trying to kill the selenium server.'); - $this->_exec("curl http://$host:$port/selenium-server/driver/?cmd=shutDownSeleniumServer"); + + $this->taskSeleniumStandaloneServer() + ->setUrl("http://$host:$port") + ->killSelenium() + ->run() + ->stopOnFail(); } /** From f7519475f148b720800298ded3a8f6dd9b591f57 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 16 Aug 2019 15:52:52 +0200 Subject: [PATCH 26/69] Make it joomla 4 compatible (#362) --- .../components/com_weblinks/models/forms/weblink.xml | 1 + .../components/com_weblinks/tables/weblink.php | 9 ++++++--- .../components/com_weblinks/views/weblinks/view.html.php | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/administrator/components/com_weblinks/models/forms/weblink.xml b/src/administrator/components/com_weblinks/models/forms/weblink.xml index a708d40..5bebeb9 100644 --- a/src/administrator/components/com_weblinks/models/forms/weblink.xml +++ b/src/administrator/components/com_weblinks/models/forms/weblink.xml @@ -38,6 +38,7 @@ label="JCATEGORY" description="COM_WEBLINKS_FIELD_CATEGORY_DESC" extension="com_weblinks" + addfieldprefix="Joomla\Component\Categories\Administrator\Field" required="true" default="" /> diff --git a/src/administrator/components/com_weblinks/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php index a4963fb..4cd90cc 100644 --- a/src/administrator/components/com_weblinks/tables/weblink.php +++ b/src/administrator/components/com_weblinks/tables/weblink.php @@ -38,8 +38,11 @@ class WeblinksTableWeblink extends JTable // Set the published column alias $this->setColumnAlias('published', 'state'); - JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); - JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); + if (version_compare(JVERSION, '4.0', '<' ) == 1) + { + JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); + JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); + } } /** @@ -194,6 +197,6 @@ class WeblinksTableWeblink extends JTable $this->metakey = implode(", ", $clean_keys); } - return true; + return parent::check(); } } diff --git a/src/administrator/components/com_weblinks/views/weblinks/view.html.php b/src/administrator/components/com_weblinks/views/weblinks/view.html.php index cc37c83..f97955f 100644 --- a/src/administrator/components/com_weblinks/views/weblinks/view.html.php +++ b/src/administrator/components/com_weblinks/views/weblinks/view.html.php @@ -93,7 +93,7 @@ class WeblinksViewWeblinks extends JViewLegacy $user = JFactory::getUser(); // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); + $bar = JToolbar::getInstance('toolbar'); JToolbarHelper::title(JText::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks'); @@ -129,7 +129,7 @@ class WeblinksViewWeblinks extends JViewLegacy if ($user->authorise('core.create', 'com_weblinks') && $user->authorise('core.edit', 'com_weblinks') && $user->authorise('core.edit.state', 'com_weblinks')) { - JHtml::_('bootstrap.modal', 'collapseModal'); + JHtml::_('bootstrap.renderModal', 'collapseModal'); $title = JText::_('JTOOLBAR_BATCH'); // Instantiate a new JLayoutFile instance and render the batch button From 4f08aee68128ef204409c7c3365ad764eeaf0387 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Fri, 16 Aug 2019 18:00:35 +0100 Subject: [PATCH 27/69] Update JORobo to latest version --- composer.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.lock b/composer.lock index b8ee76d..931efa5 100644 --- a/composer.lock +++ b/composer.lock @@ -1570,7 +1570,7 @@ "email": "puneet.kala@community.joomla.org" }, { - "name": "Javier Gómez", + "name": "Javier Gomez", "email": "javier.gomez@community.joomla.org" } ], @@ -1635,16 +1635,16 @@ }, { "name": "joomla-projects/jorobo", - "version": "0.7.0", + "version": "0.7.2", "source": { "type": "git", "url": "https://github.com/joomla-projects/jorobo.git", - "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62" + "reference": "9ed1190edab1e5f69286570e2ebdd451f6d15b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/1386f7712e39f08a3c1722e514eebdd6d0580c62", - "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62", + "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/9ed1190edab1e5f69286570e2ebdd451f6d15b01", + "reference": "9ed1190edab1e5f69286570e2ebdd451f6d15b01", "shasum": "" }, "require": { @@ -1671,17 +1671,17 @@ "name": "Yves Hoppe", "email": "yves@compojoom.com" }, - { - "name": "Niels Braczek", - "email": "nbraczek@bsds.de" - }, { "name": "Niels Nübel", "email": "niels@niels-nuebel.de" + }, + { + "name": "Niels Braczek", + "email": "nbraczek@bsds.de" } ], "description": "Tools and Tasks based on Robo.li for Joomla Extension Development and Releases", - "time": "2017-08-24T01:24:32+00:00" + "time": "2019-08-16T16:56:45+00:00" }, { "name": "joomla-projects/selenium-server-standalone", @@ -1711,7 +1711,7 @@ "email": "sven.eisenschmidt@gmail.com" }, { - "name": "Javier Gómez", + "name": "Javier Gomez", "email": "javier.gomez@community.joomla.org" } ], @@ -2456,8 +2456,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "role": "lead", + "email": "sb@sebastian-bergmann.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -3334,8 +3334,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", From f23e5402a7bf4c23882128b6373168efc9f74919 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Sat, 17 Aug 2019 12:54:15 +0100 Subject: [PATCH 28/69] Use non-deprecated renderField method --- .../components/com_weblinks/views/weblink/tmpl/edit.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php index 998ad90..dc4c024 100644 --- a/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php +++ b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php @@ -49,8 +49,8 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
- form->getControlGroup('url'); ?> - form->getControlGroup('description'); ?> + form->renderField('url'); ?> + form->renderField('description'); ?>
@@ -62,9 +62,9 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
- form->getControlGroup('images'); ?> + form->renderField('images'); ?> form->getGroup('images') as $field) : ?> - getControlGroup(); ?> + renderField(); ?>
From adc32eeb34a94cb078801c1d5b2645d34992f21d Mon Sep 17 00:00:00 2001 From: wilsonge Date: Thu, 12 Sep 2019 09:50:15 +0100 Subject: [PATCH 29/69] Downgrade selenium until it works with latest linux browser versions --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ba46131..caa2482 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "joomla-projects/joomla-browser": "v3.9.0", "consolidation/robo": "^1.0.0", "joomla-projects/joomla-testing-robo": "~1.0", - "joomla-projects/selenium-server-standalone": "^v3.1.0", + "joomla-projects/selenium-server-standalone": "^v3.14.0", "fzaninotto/faker": "^1.6", "joomla-projects/jorobo": "~0.7", "behat/gherkin": "^4.4.1" diff --git a/composer.lock b/composer.lock index 82931d9..2b1ebb4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1b0489cad34d1fd663da3e41426498d1", + "content-hash": "db99c7bbc7374f5761f251e14e3530ff", "packages": [], "packages-dev": [ { From 855fcb03c1cb32b1f6c96d7b8dbec49b19a7cfdf Mon Sep 17 00:00:00 2001 From: wilsonge Date: Thu, 12 Sep 2019 10:00:55 +0100 Subject: [PATCH 30/69] Fix previous commit downgrading selenium --- composer.json | 2 +- composer.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index caa2482..75407ee 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "joomla-projects/joomla-browser": "v3.9.0", "consolidation/robo": "^1.0.0", "joomla-projects/joomla-testing-robo": "~1.0", - "joomla-projects/selenium-server-standalone": "^v3.14.0", + "joomla-projects/selenium-server-standalone": "v3.14.0", "fzaninotto/faker": "^1.6", "joomla-projects/jorobo": "~0.7", "behat/gherkin": "^4.4.1" diff --git a/composer.lock b/composer.lock index 2b1ebb4..cbdbe1a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "db99c7bbc7374f5761f251e14e3530ff", + "content-hash": "32fb4f9541af70285cb07447f96baf12", "packages": [], "packages-dev": [ { @@ -2248,16 +2248,16 @@ }, { "name": "joomla-projects/selenium-server-standalone", - "version": "3.141.59", + "version": "v3.14.0", "source": { "type": "git", "url": "https://github.com/joomla-projects/selenium-server-standalone.git", - "reference": "2a2310b540344169d52e3d517d3f1d1b4d0b9f4f" + "reference": "2939723f470918b6b72b0c05ba1978a41f0ef49d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/selenium-server-standalone/zipball/2a2310b540344169d52e3d517d3f1d1b4d0b9f4f", - "reference": "2a2310b540344169d52e3d517d3f1d1b4d0b9f4f", + "url": "https://api.github.com/repos/joomla-projects/selenium-server-standalone/zipball/2939723f470918b6b72b0c05ba1978a41f0ef49d", + "reference": "2939723f470918b6b72b0c05ba1978a41f0ef49d", "shasum": "" }, "bin": [ @@ -2274,14 +2274,14 @@ "Apache-2.0" ], "authors": [ - { - "name": "Puneet Kala", - "email": "puneet.kala@community.joomla.org" - }, { "name": "Sven Eisenschmidt", "email": "sven.eisenschmidt@gmail.com" }, + { + "name": "Puneet Kala", + "email": "puneet.kala@community.joomla.org" + }, { "name": "Javier Gomez", "email": "javier.gomez@community.joomla.org" @@ -2293,7 +2293,7 @@ "selenium", "testing" ], - "time": "2019-07-31T05:15:24+00:00" + "time": "2018-08-19T04:08:16+00:00" }, { "name": "joomla/compat", From 4dd89a35c7ec2af031befdb6a364bb4ac2f20f14 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Thu, 12 Sep 2019 10:12:01 +0100 Subject: [PATCH 31/69] Save artifacts on failure --- .drone.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 053116b..312e7f4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,6 +18,27 @@ steps: - fluxbox > /dev/null 2>&1 & - vendor/bin/robo run:tests + - name: artifacts-system-tests + image: cschlosser/drone-ftps + depends_on: [ system-tests-postgres ] + environment: + FTP_USERNAME: + from_secret: ftpusername + FTP_PASSWORD: + from_secret: ftppassword + PLUGIN_HOSTNAME: ci.joomla.org:21 + PLUGIN_SRC_DIR: /tests/Codeception/_output/ + PLUGIN_DEST_DIR: /artifacts + PLUGIN_SECURE: false + PLUGIN_EXCLUDE: ^\.git/$ + commands: + - export PLUGIN_DEST_DIR=$PLUGIN_DEST_DIR/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST_$DRONE_BUILD_NUMBER/system-tests + - echo https://ci.joomla.org:444$PLUGIN_DEST_DIR + - /bin/upload.sh + when: + status: + - failure + volumes: - name: weblinks_cache host: @@ -25,6 +46,6 @@ volumes: --- kind: signature -hmac: 41c9d399a788c8e97a0444ee8483682cfcb5b21d920b4012852a48ed3b2e9db8 +hmac: d923aa6c5902d07ab60350280a17836652e9541a931f84f5e0a686691d4c9cec ... From 362c14774cc6d4707b04ce927d374f3b4bfffb3d Mon Sep 17 00:00:00 2001 From: wilsonge Date: Thu, 12 Sep 2019 10:18:46 +0100 Subject: [PATCH 32/69] Fix depends_on step from previous commit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 312e7f4..97feb3c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ steps: - name: artifacts-system-tests image: cschlosser/drone-ftps - depends_on: [ system-tests-postgres ] + depends_on: [ weblinks-codeception-tests ] environment: FTP_USERNAME: from_secret: ftpusername @@ -46,6 +46,6 @@ volumes: --- kind: signature -hmac: d923aa6c5902d07ab60350280a17836652e9541a931f84f5e0a686691d4c9cec +hmac: 8ab7587b9957ad1005b33a330b63bfb09ab2394cae3cc1da5972e33895fee4ec ... From 97a74f5b442f2642906ced3e3dc91fc6acd6d67b Mon Sep 17 00:00:00 2001 From: wilsonge Date: Thu, 12 Sep 2019 10:30:31 +0100 Subject: [PATCH 33/69] Hopefully fix source location --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 97feb3c..e6b233b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,7 @@ steps: FTP_PASSWORD: from_secret: ftppassword PLUGIN_HOSTNAME: ci.joomla.org:21 - PLUGIN_SRC_DIR: /tests/Codeception/_output/ + PLUGIN_SRC_DIR: /tests/_output/ PLUGIN_DEST_DIR: /artifacts PLUGIN_SECURE: false PLUGIN_EXCLUDE: ^\.git/$ @@ -46,6 +46,6 @@ volumes: --- kind: signature -hmac: 8ab7587b9957ad1005b33a330b63bfb09ab2394cae3cc1da5972e33895fee4ec +hmac: 9346f0e74d2605ebe7bc9d33ad0588c1073ba3a9d9b254b71a7a85e219089449 ... From b304552f379706c0aca1b2997a08cdf45cbf01c6 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 16 Sep 2019 16:06:47 +0200 Subject: [PATCH 34/69] Release 3.7.0 to upgrade server (#414) --- manifest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.xml b/manifest.xml index 522deae..e950c85 100644 --- a/manifest.xml +++ b/manifest.xml @@ -5,11 +5,11 @@ Joomla! CMS Weblinks Package pkg_weblinks package - 3.6.0 + 3.7.0 site - https://github.com/joomla-extensions/weblinks/releases/tag/3.6.0 + https://github.com/joomla-extensions/weblinks/releases/tag/3.7.0 - https://downloads.joomla.org/extensions/weblinks/3-6-0/pkg-weblinks-3.6.0.zip + https://downloads.joomla.org/extensions/weblinks/3-7-0/pkg-weblinks-3.7.0.zip From 51403b36b1fad7b7a286abc5c788bb916389e947 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Mon, 16 Sep 2019 16:08:01 +0200 Subject: [PATCH 35/69] Fix: Inconsistent PHP minimum version (#412) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 75407ee..90bd511 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ } }, "require" : { - "php": ">=5.4" + "php": "^5.3.10|^7.0" }, "require-dev": { "php": ">=5.6", From 5ad08ed6e0931966413f4081973f5ed0a086ca42 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 16 Sep 2019 15:08:17 +0100 Subject: [PATCH 36/69] =?UTF-8?q?Update=20deprecated=20license=20=E2=80=A6?= =?UTF-8?q?=20(#410)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The spdx have deprecated the short license identifier GPL-2.0+ and we should use GPL-2.0-or-later https://spdx.org/licenses/ --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 90bd511..02c1d68 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name" : "joomla-extensions/weblinks", "description": "The Open Source PHP Framework for creating complex Joomla extensions", - "license" : "GPL-2.0+", + "license" : "GPL-2.0-or-later", "config": { "platform": { "php": "5.6.0" From 31964a86e9c1f76b2f303b2d2ed06d97b9caab4d Mon Sep 17 00:00:00 2001 From: infograf768 Date: Sun, 2 Aug 2020 12:07:00 +0200 Subject: [PATCH 37/69] Update view.html.php Create the Associations Toolbar button to directly link to com_associations when editing a weblink --- .../com_weblinks/views/weblink/view.html.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/administrator/components/com_weblinks/views/weblink/view.html.php b/src/administrator/components/com_weblinks/views/weblink/view.html.php index e670e92..98d1eb0 100644 --- a/src/administrator/components/com_weblinks/views/weblink/view.html.php +++ b/src/administrator/components/com_weblinks/views/weblink/view.html.php @@ -42,7 +42,7 @@ class WeblinksViewWeblink extends JViewLegacy return false; } - + // If we are forcing a language in modal (used for associations). if ($this->getLayout() === 'modal' && $forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd')) { @@ -88,15 +88,23 @@ class WeblinksViewWeblink extends JViewLegacy JToolbarHelper::apply('weblink.apply'); JToolbarHelper::save('weblink.save'); } + if (!$checkedOut && (count($user->getAuthorisedCategories('com_weblinks', 'core.create')))) { JToolbarHelper::save2new('weblink.save2new'); } + // If an existing item, can save to a copy. if (!$isNew && (count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0)) { JToolbarHelper::save2copy('weblink.save2copy'); } + + if (JLanguageAssociations::isEnabled() && JComponentHelper::isEnabled('com_associations')) + { + JToolbarHelper::custom('weblink.editAssociations', 'contract', 'contract', 'JTOOLBAR_ASSOCIATIONS', false, false); + } + if (empty($this->item->id)) { JToolbarHelper::cancel('weblink.cancel'); From dffe7c53c385eafb8b0cbb189d9c27c7c1573dc3 Mon Sep 17 00:00:00 2001 From: Maikol Fustes <54444319+maikol-ortigueira@users.noreply.github.com> Date: Mon, 28 Sep 2020 12:45:14 +0200 Subject: [PATCH 38/69] Fix for #427 (#428) This fix removes the warning if no weblinks --- src/components/com_weblinks/models/categories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/com_weblinks/models/categories.php b/src/components/com_weblinks/models/categories.php index 0ae095a..e5295b3 100644 --- a/src/components/com_weblinks/models/categories.php +++ b/src/components/com_weblinks/models/categories.php @@ -92,7 +92,7 @@ class WeblinksModelCategories extends JModelList */ public function getItems() { - if (!count($this->_items)) + if (is_null($this->_items) || !count($this->_items)) { $app = JFactory::getApplication(); $menu = $app->getMenu(); From bfee41b26d60b340d7e3b9e9610a660e4d9c3560 Mon Sep 17 00:00:00 2001 From: ReLater Date: Wed, 17 Feb 2021 15:27:23 +0100 Subject: [PATCH 39/69] Return an array for count() --- src/modules/mod_weblinks/helper.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/mod_weblinks/helper.php b/src/modules/mod_weblinks/helper.php index 78a27ce..85fbeac 100644 --- a/src/modules/mod_weblinks/helper.php +++ b/src/modules/mod_weblinks/helper.php @@ -106,10 +106,8 @@ class ModWeblinksHelper $item->link = $item->url; } } - - return $items; } - return; + return $items; } } From 84ec6b93e7e327c590c0378ce9d16eb24116f8e4 Mon Sep 17 00:00:00 2001 From: Constantin Romankiewicz Date: Sun, 28 Mar 2021 14:22:51 +0200 Subject: [PATCH 40/69] Fix PHP warnings Similar to https://github.com/joomla/joomla-cms/pull/27273 Fixes #433. This PR fixes PHP warnings for the weblinks category view. --- .../com_weblinks/views/category/tmpl/default_items.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/com_weblinks/views/category/tmpl/default_items.php b/src/components/com_weblinks/views/category/tmpl/default_items.php index c49b298..b176561 100644 --- a/src/components/com_weblinks/views/category/tmpl/default_items.php +++ b/src/components/com_weblinks/views/category/tmpl/default_items.php @@ -13,9 +13,6 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('behavior.framework'); -// Create a shortcut for params. -$params = &$this->item->params; - // Get the user object. $user = JFactory::getUser(); @@ -69,7 +66,7 @@ $listDirn = $this->escape($this->state->get('list.direction')); - + params); ?> @@ -128,8 +125,8 @@ $listDirn = $this->escape($this->state->get('list.direction'));
tags->getItemTags('com_weblinks.weblink', $item->id); ?> params->get('show_tags', 1)) : ?> - item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> - item->tagLayout->render($tagsData); ?> + + render($tagsData); ?> params->get('show_link_description')) and ($item->description != '')) : ?> images); ?> From d42f2227d7ad979f1cac22f2f97446c555731737 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 15 Aug 2021 16:31:31 +0200 Subject: [PATCH 41/69] Fix references to the CMS staging branch --- README.md | 4 ++-- RoboFile.dist.ini | 2 +- RoboFile.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8f114ee..a881583 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ skipClone = false cmsPath = tests/joomla-cms3 ; If you want to clone a different branch, you can set it here -branch = staging +branch = 3.10-dev ; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here. localUser = @@ -264,7 +264,7 @@ The currently available options are as follows: * `skipClone`: set to `true` to avoid the cms repo being deleted and re-cloned at each test execution. Useful to save time and bandwidth while you're debugging your test environment. But please be aware that if you don't refresh the repo you'll have to manually check the `installation` folder is present and the `configuration.php` is not. * `cmsPath`: set to the local path (absolute or relative) where you'd like the test website to be installed. Default is `tests/joomla-cms3`. -* `branch`: set to whatever existing branch from the `joomla-cms` project if you want to clone that specific branch. Default is `staging`. +* `branch`: set to whatever existing branch from the `joomla-cms` project if you want to clone that specific branch. Default is `3.10-dev`. ## Additional options diff --git a/RoboFile.dist.ini b/RoboFile.dist.ini index bca9b64..aeffe3b 100644 --- a/RoboFile.dist.ini +++ b/RoboFile.dist.ini @@ -7,7 +7,7 @@ skipClone = false cmsPath = tests/joomla ; If you want to clone a different branch, you can set it here -branch = staging +branch = 3.10-dev ; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here. localUser = www-data diff --git a/RoboFile.php b/RoboFile.php index dd85b57..31ba1bd 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -398,7 +398,7 @@ class RoboFile extends Tasks */ private function buildGitCloneCommand() { - $branch = empty($this->configuration->branch) ? 'staging' : $this->configuration->branch; + $branch = empty($this->configuration->branch) ? '3.10-dev' : $this->configuration->branch; return "git" . $this->executableExtension . " clone -b $branch --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/cache"; } From 29ca3c8d5293d93d90563448f1eb6cee2755519b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 15 Aug 2021 16:49:31 +0200 Subject: [PATCH 42/69] Fix wrong default path in documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a881583..f7c044f 100644 --- a/README.md +++ b/README.md @@ -258,7 +258,7 @@ The tests in Weblinks Extension use Codeception Testing Framework, if you want t This is not required, and if in doubt you can just skip this section, but there may be some specific use cases when you need (or want) to override the default behaviour of RoboFile.php. To do this, copy `RoboFile.dist.ini` to `RoboFile.ini` and add options in INI format, one per line, e.g. skipClone = true - cmsPath = tests/joomla-cms3 + cmsPath = tests/joomla The currently available options are as follows: From 95d0f86f1ef04545b437b735e56a592c424fe8e2 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Wed, 18 Aug 2021 14:24:42 +0700 Subject: [PATCH 43/69] Return empty array on failure --- src/modules/mod_weblinks/helper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/mod_weblinks/helper.php b/src/modules/mod_weblinks/helper.php index 85fbeac..8bf04fb 100644 --- a/src/modules/mod_weblinks/helper.php +++ b/src/modules/mod_weblinks/helper.php @@ -106,8 +106,10 @@ class ModWeblinksHelper $item->link = $item->url; } } + + return $items; } - return $items; + return array(); } } From 40fec2bdfa4701f82872743eafcef6738c7166fc Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Wed, 18 Aug 2021 14:39:15 +0700 Subject: [PATCH 44/69] Better check --- src/components/com_weblinks/models/categories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/com_weblinks/models/categories.php b/src/components/com_weblinks/models/categories.php index e5295b3..745e262 100644 --- a/src/components/com_weblinks/models/categories.php +++ b/src/components/com_weblinks/models/categories.php @@ -92,7 +92,7 @@ class WeblinksModelCategories extends JModelList */ public function getItems() { - if (is_null($this->_items) || !count($this->_items)) + if ($this->_items === null) { $app = JFactory::getApplication(); $menu = $app->getMenu(); From 620f535cebe78afcaaf31c3bd87acf90f27f892a Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Wed, 18 Aug 2021 15:36:02 +0700 Subject: [PATCH 45/69] Improve show tags code --- .../com_weblinks/views/category/tmpl/default_items.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/com_weblinks/views/category/tmpl/default_items.php b/src/components/com_weblinks/views/category/tmpl/default_items.php index b176561..d2e1ae4 100644 --- a/src/components/com_weblinks/views/category/tmpl/default_items.php +++ b/src/components/com_weblinks/views/category/tmpl/default_items.php @@ -123,10 +123,8 @@ $listDirn = $this->escape($this->state->get('list.direction')); } ?>
- tags->getItemTags('com_weblinks.weblink', $item->id); ?> - params->get('show_tags', 1)) : ?> - - render($tagsData); ?> + params->get('show_tags', 1) && !empty($item->tags->itemTags)) : ?> + tags->itemTags); ?> params->get('show_link_description')) and ($item->description != '')) : ?> images); ?> From d1e941f581e17892b7a3cdf6ba2dbdd223257e2a Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Wed, 18 Aug 2021 16:05:20 +0700 Subject: [PATCH 46/69] Resolve conflicts --- .../com_weblinks/views/category/tmpl/default_items.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/components/com_weblinks/views/category/tmpl/default_items.php b/src/components/com_weblinks/views/category/tmpl/default_items.php index d0aac0c..877d265 100644 --- a/src/components/com_weblinks/views/category/tmpl/default_items.php +++ b/src/components/com_weblinks/views/category/tmpl/default_items.php @@ -13,9 +13,6 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('behavior.framework'); -// Create a shortcut for params. -$params = &$this->item->params; - // Get the user object. $user = JFactory::getUser(); @@ -69,7 +66,7 @@ $listDirn = $this->escape($this->state->get('list.direction')); - + params); ?> @@ -123,9 +120,8 @@ $listDirn = $this->escape($this->state->get('list.direction')); ?> tags->getItemTags('com_weblinks.weblink', $item->id); ?> - params->get('show_tags', 1)) : ?> - item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> - item->tagLayout->render($tagsData); ?> + params->get('show_tags', 1) && !empty($item->tags->itemTags)) : ?> + tags->itemTags); ?> params->get('show_link_description')) && ($item->description != '')) : ?> images); ?> From 8ee3f1ba1a8de932063dac70c28cf268f28b65b9 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Wed, 18 Aug 2021 16:34:22 +0700 Subject: [PATCH 47/69] Prevent warnings on PHP 8 --- src/components/com_weblinks/views/category/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/com_weblinks/views/category/view.html.php b/src/components/com_weblinks/views/category/view.html.php index 78fe1fc..305d546 100644 --- a/src/components/com_weblinks/views/category/view.html.php +++ b/src/components/com_weblinks/views/category/view.html.php @@ -86,7 +86,7 @@ class WeblinksViewCategory extends JViewCategory $path = array(array('title' => $this->category->title, 'link' => '')); $category = $this->category->getParent(); - while (($menu->query['option'] != 'com_weblinks' || $id != $category->id) && $category->id > 1) + while ($category !== null && $category->id !== 'root' && ($menu->query['option'] != 'com_weblinks' || $id != $category->id)) { $path[] = array('title' => $category->title, 'link' => WeblinksHelperRoute::getCategoryRoute($category->id)); $category = $category->getParent(); From 6d0f3cbbdb1cde4d2b57c8a1699baaf89dd656a2 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Fri, 20 Aug 2021 18:16:05 +0700 Subject: [PATCH 48/69] Update language items --- src/administrator/language/en-GB/en-GB.com_weblinks.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/administrator/language/en-GB/en-GB.com_weblinks.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.ini index 5c0d9ae..9d103b1 100644 --- a/src/administrator/language/en-GB/en-GB.com_weblinks.ini +++ b/src/administrator/language/en-GB/en-GB.com_weblinks.ini @@ -65,9 +65,9 @@ COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image" COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC="Select a web links category to display." COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a Category" COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for a category." -COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags" +COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Category Tags" COM_WEBLINKS_FIELD_SHOW_TAGS_DESC="Show the tags for a web link." -COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Show Tags" +COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Tags" COM_WEBLINKS_FIELD_STATE_DESC="Set publication status." COM_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected." COM_WEBLINKS_FIELD_TARGET_LABEL="Target" From c70b2f70b0203c6db5253856bc1fd0045a647708 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Fri, 27 Aug 2021 10:38:45 +0700 Subject: [PATCH 49/69] Prevent changing created_by if the current user is not allowed to access to com_users --- .../components/com_weblinks/models/weblink.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/administrator/components/com_weblinks/models/weblink.php b/src/administrator/components/com_weblinks/models/weblink.php index cb238fb..2830045 100644 --- a/src/administrator/components/com_weblinks/models/weblink.php +++ b/src/administrator/components/com_weblinks/models/weblink.php @@ -155,6 +155,12 @@ class WeblinksModelWeblink extends JModelAdmin $form->setFieldAttribute('publish_down', 'filter', 'unset'); } + // Don't allow to change the created_by user if not allowed to access com_users. + if (!JFactory::getUser()->authorise('core.manage', 'com_users')) + { + $form->setFieldAttribute('created_by', 'filter', 'unset'); + } + return $form; } From f8ea546cfe6429a32cd8f1463f4375bf8c9f3e05 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Sat, 28 Aug 2021 17:01:14 +0700 Subject: [PATCH 50/69] Let's build script update version number --- src/plugins/editors-xtd/weblink/weblink.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/editors-xtd/weblink/weblink.xml b/src/plugins/editors-xtd/weblink/weblink.xml index 29c425a..f1b2f37 100644 --- a/src/plugins/editors-xtd/weblink/weblink.xml +++ b/src/plugins/editors-xtd/weblink/weblink.xml @@ -7,7 +7,7 @@ GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org - 3.7.0 + ##VERSION## PLG_EDITORS-XTD_WEBLINK_XML_DESCRIPTION ##FILES## From 3883eafa37a5fbf8fcdc69b4d56c94b8ba0a87a1 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Sat, 28 Aug 2021 20:35:09 +0700 Subject: [PATCH 51/69] Update version number --- jorobo.dist.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jorobo.dist.ini b/jorobo.dist.ini index b157b82..55820cb 100644 --- a/jorobo.dist.ini +++ b/jorobo.dist.ini @@ -1,5 +1,5 @@ extension = weblinks -version = 3.7.0 +version = 3.9.0-rc1 source = src target = package From d007d1d29d3dd99fa08ebc88e26117c6b8920ee5 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Sat, 28 Aug 2021 23:25:11 +0700 Subject: [PATCH 52/69] CS --- .../com_weblinks/helpers/weblinks.php | 3 +++ .../models/fields/modal/weblink.php | 11 ++++++++++- .../components/com_weblinks/script.php | 18 ++++++++++++------ .../components/com_weblinks/tables/weblink.php | 3 ++- .../com_weblinks/views/weblinks/view.html.php | 1 + .../com_weblinks/models/category.php | 2 +- src/components/com_weblinks/router.php | 4 ++-- .../views/categories/view.html.php | 1 + .../views/category/tmpl/default_children.php | 4 ++-- .../com_weblinks/views/category/view.html.php | 2 +- src/plugins/finder/weblinks/weblinks.php | 2 +- src/plugins/search/weblinks/weblinks.php | 12 ++++++------ 12 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/administrator/components/com_weblinks/helpers/weblinks.php b/src/administrator/components/com_weblinks/helpers/weblinks.php index 4fee715..987dc21 100644 --- a/src/administrator/components/com_weblinks/helpers/weblinks.php +++ b/src/administrator/components/com_weblinks/helpers/weblinks.php @@ -146,14 +146,17 @@ class WeblinksHelper extends JHelperContent { $item->count_published = $weblink->count; } + if ($weblink->state == 0) { $item->count_unpublished = $weblink->count; } + if ($weblink->state == 2) { $item->count_archived = $weblink->count; } + if ($weblink->state == -2) { $item->count_trashed = $weblink->count; diff --git a/src/administrator/components/com_weblinks/models/fields/modal/weblink.php b/src/administrator/components/com_weblinks/models/fields/modal/weblink.php index 1a94c60..df393f7 100644 --- a/src/administrator/components/com_weblinks/models/fields/modal/weblink.php +++ b/src/administrator/components/com_weblinks/models/fields/modal/weblink.php @@ -65,7 +65,8 @@ class JFormFieldModal_Weblink extends JFormField function jSelectWeblink_" . $this->id . "(id, title, catid, object, url, language) { window.processModalSelect('Weblink', '" . $this->id . "', id, title, catid, object, url, language); } - "); + " + ); $scriptSelect[$this->id] = true; } } @@ -94,6 +95,7 @@ class JFormFieldModal_Weblink extends JFormField ->from($db->quoteName('#__weblinks')) ->where($db->quoteName('id') . ' = ' . (int) $value); $db->setQuery($query); + try { $title = $db->loadResult(); @@ -103,6 +105,7 @@ class JFormFieldModal_Weblink extends JFormField JError::raiseWarning(500, $e->getMessage()); } } + $title = empty($title) ? JText::_('COM_WEBLINKS_SELECT_A_WEBLINK') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8'); // The current weblink display field. @@ -122,6 +125,7 @@ class JFormFieldModal_Weblink extends JFormField . ' ' . JText::_('JSELECT') . ''; } + // New weblink button if ($allowNew) { @@ -135,6 +139,7 @@ class JFormFieldModal_Weblink extends JFormField . ' ' . JText::_('JACTION_CREATE') . ''; } + // Edit weblink button if ($allowEdit) { @@ -148,6 +153,7 @@ class JFormFieldModal_Weblink extends JFormField . ' ' . JText::_('JACTION_EDIT') . ''; } + // Clear weblink button if ($allowClear) { @@ -159,6 +165,7 @@ class JFormFieldModal_Weblink extends JFormField . '' . JText::_('JCLEAR') . ''; } + $html .= ''; // Select weblink modal @@ -236,10 +243,12 @@ class JFormFieldModal_Weblink extends JFormField ) ); } + // Note: class='required' for client side validation. $class = $this->required ? ' class="required modal-value"' : ''; $html .= ''; + return $html; } diff --git a/src/administrator/components/com_weblinks/script.php b/src/administrator/components/com_weblinks/script.php index b43cae4..8e8e121 100644 --- a/src/administrator/components/com_weblinks/script.php +++ b/src/administrator/components/com_weblinks/script.php @@ -153,7 +153,8 @@ class Com_WeblinksInstallerScript . $db->quote('com_weblinks.weblink') . ', ' . $db->quote( '{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"}, - "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' + "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' + ) . ', ' . $db->quote('') . ', ' . $db->quote( '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias", @@ -161,7 +162,8 @@ class Com_WeblinksInstallerScript "core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"url", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", - "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}') . ', ' + "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}' + ) . ', ' . $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', ' . $db->quote( '{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml", @@ -170,7 +172,8 @@ class Com_WeblinksInstallerScript "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, - {"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}') + {"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}' + ) ); $db->setQuery($query); @@ -189,7 +192,8 @@ class Com_WeblinksInstallerScript . $db->quote('com_weblinks.category') . ', ' . $db->quote(' {"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"}, - "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' + "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' + ) . ', ' . $db->quote('') . ', ' . $db->quote(' {"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias", @@ -198,7 +202,8 @@ class Com_WeblinksInstallerScript "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, - "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}') . ', ' + "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' + ) . ', ' . $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', ' . $db->quote(' {"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", @@ -209,7 +214,8 @@ class Com_WeblinksInstallerScript "displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id", "displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id", "displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id", - "displayColumn":"title"}]}') + "displayColumn":"title"}]}' + ) ); $db->setQuery($query); diff --git a/src/administrator/components/com_weblinks/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php index 0346630..d46c863 100644 --- a/src/administrator/components/com_weblinks/tables/weblink.php +++ b/src/administrator/components/com_weblinks/tables/weblink.php @@ -38,7 +38,7 @@ class WeblinksTableWeblink extends JTable // Set the published column alias $this->setColumnAlias('published', 'state'); - if (version_compare(JVERSION, '4.0', '<' ) == 1) + if (version_compare(JVERSION, '4.0', '<') == 1) { JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); @@ -130,6 +130,7 @@ class WeblinksTableWeblink extends JTable if (trim($this->title) == '') { $this->setError(JText::_('COM_WEBLINKS_ERR_TABLES_TITLE')); + return false; } diff --git a/src/administrator/components/com_weblinks/views/weblinks/view.html.php b/src/administrator/components/com_weblinks/views/weblinks/view.html.php index f97955f..dd95828 100644 --- a/src/administrator/components/com_weblinks/views/weblinks/view.html.php +++ b/src/administrator/components/com_weblinks/views/weblinks/view.html.php @@ -47,6 +47,7 @@ class WeblinksViewWeblinks extends JViewLegacy if (count($errors = $this->get('Errors'))) { JError::raiseError(500, implode("\n", $errors)); + return false; } diff --git a/src/components/com_weblinks/models/category.php b/src/components/com_weblinks/models/category.php index 9378226..7f01801 100644 --- a/src/components/com_weblinks/models/category.php +++ b/src/components/com_weblinks/models/category.php @@ -186,7 +186,7 @@ class WeblinksModelCategory extends JModelList $search = $db->quote('%' . $db->escape($search, true) . '%'); $query->where('(a.title LIKE ' . $search . ')'); } - + // If grouping by subcategory, add the subcategory list ordering clause. if ($this->getState('category.group', 0)) { diff --git a/src/components/com_weblinks/router.php b/src/components/com_weblinks/router.php index ee5253d..419434e 100644 --- a/src/components/com_weblinks/router.php +++ b/src/components/com_weblinks/router.php @@ -65,7 +65,7 @@ class WeblinksRouter extends JComponentRouterBase } // Are we dealing with an weblink that is attached to a menu item? - if (isset($query['view']) && ($mView == $query['view']) and (isset($query['id'])) and ($mId == (int) $query['id'])) + if (isset($query['view']) && ($mView == $query['view']) && (isset($query['id'])) && ($mId == (int) $query['id'])) { unset($query['view']); unset($query['catid']); @@ -74,7 +74,7 @@ class WeblinksRouter extends JComponentRouterBase return $segments; } - if (isset($view) and ($view == 'category' or $view == 'weblink')) + if (isset($view) && ($view == 'category' || $view == 'weblink')) { if ($mId != (int) $query['id'] || $mView != $view) { diff --git a/src/components/com_weblinks/views/categories/view.html.php b/src/components/com_weblinks/views/categories/view.html.php index 2531105..ced41e0 100644 --- a/src/components/com_weblinks/views/categories/view.html.php +++ b/src/components/com_weblinks/views/categories/view.html.php @@ -53,6 +53,7 @@ class WeblinksViewCategories extends JViewCategories if (count($errors = $this->get('Errors'))) { JError::raiseWarning(500, implode("\n", $errors)); + return false; } diff --git a/src/components/com_weblinks/views/category/tmpl/default_children.php b/src/components/com_weblinks/views/category/tmpl/default_children.php index efac70a..2d87674 100644 --- a/src/components/com_weblinks/views/category/tmpl/default_children.php +++ b/src/components/com_weblinks/views/category/tmpl/default_children.php @@ -33,9 +33,9 @@ if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) : description, '', 'com_weblinks.category'); ?> - + - params->get('show_cat_num_links') == 1) :?> + params->get('show_cat_num_links') == 1) :?>