diff --git a/.gitignore b/.gitignore index 272c42c35..58ac88593 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /lib/Cake/Console/Templates/skel/tmp/ /plugins /vendors +!/vendors/autoload.php /build /dist /tags diff --git a/.travis/configure b/.travis/configure index 49fc90990..fa250e525 100755 --- a/.travis/configure +++ b/.travis/configure @@ -1,7 +1,6 @@ #!/usr/bin/env bash if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]] ; then pear config-set preferred_state snapshot && yes "" | pecl install mcrypt ; fi composer require --prefer-dist --update-with-dependencies --dev phpunit/phpunit ^${PHPUNIT} cakephp/cakephp-codesniffer ^${PHPCS} -echo "require_once 'vendors/autoload.php';" >> app/Config/bootstrap.php sudo locale-gen de_DE sudo locale-gen es_ES if [[ ${DB} == 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi diff --git a/README.md b/README.md index 5e54378c6..9b57a017c 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,8 @@ However, if these files exist they will affect the behavior of the build process List of dependencies to be installed with `composer`. The format is documented [here](https://getcomposer.org/doc/04-schema.md). + Plugins are registered in both _git submodule_ and _composer.json_. To allow a plugin to accept ```composer update```, edit _composer.json_ according to the available released tags. In the plugin's home repository (app/Plugin//), call```git tag``` or ``git log``` for more information. + >_DEVELOPER TIP:_ To push tags : ```git tag` && git push --tags```. ### Compatibility diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php index c83a0bcf9..5884d0987 100755 --- a/app/Config/bootstrap.php +++ b/app/Config/bootstrap.php @@ -118,4 +118,4 @@ /** * Load Markdown Plugin */ -CakePlugin::load(array('Markdown' => array('bootstrap' => true))); \ No newline at end of file +CakePlugin::load(array('Markdown' => array('bootstrap' => true))); diff --git a/app/Plugin/Markdown b/app/Plugin/Markdown index 411862a01..1bdffb902 160000 --- a/app/Plugin/Markdown +++ b/app/Plugin/Markdown @@ -1 +1 @@ -Subproject commit 411862a013c380642e7a458940fa13a6dc7d0d6e +Subproject commit 1bdffb9024bbcfbcb3e99397dedc1c7dbfa1ac26 diff --git a/composer.json b/composer.json index bc621ad05..738e1fbaf 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "require": { "php": ">=5.3.0", - "b23prodtm/markdown-plugin": ">=0.9" + "b23prodtm/markdown-plugin": "master@dev" }, "suggest": { "ext-openssl": "You need to install ext-openssl or ext-mcrypt to use AES-256 encryption", @@ -26,7 +26,7 @@ }, "require-dev": { "phpunit/phpunit": "^3", - "cakephp/cakephp-codesniffer": "^1" + "cakephp/cakephp-codesniffer": "^3" }, "extra": { "installer-paths": { diff --git a/composer.lock b/composer.lock index e7bed30d6..787098879 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,23 @@ { "_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#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a9a23707520e84e8e32877f96bb4cb5e", + "content-hash": "04e9640d9cad3c92059819fc6b938ca4", "packages": [ { "name": "b23prodtm/markdown-plugin", - "version": "0.9", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/b23prodtm/markdown-plugin.git", - "reference": "411862a013c380642e7a458940fa13a6dc7d0d6e" + "reference": "1bdffb9024bbcfbcb3e99397dedc1c7dbfa1ac26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/b23prodtm/markdown-plugin/zipball/411862a013c380642e7a458940fa13a6dc7d0d6e", - "reference": "411862a013c380642e7a458940fa13a6dc7d0d6e", + "url": "https://api.github.com/repos/b23prodtm/markdown-plugin/zipball/1bdffb9024bbcfbcb3e99397dedc1c7dbfa1ac26", + "reference": "1bdffb9024bbcfbcb3e99397dedc1c7dbfa1ac26", "shasum": "" }, "require": { @@ -50,20 +50,20 @@ "markdown", "plugin" ], - "time": "2018-08-16T16:54:29+00:00" + "time": "2018-09-23T18:28:49+00:00" }, { "name": "composer/installers", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "049797d727261bf27f2690430d935067710049c2" + "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/049797d727261bf27f2690430d935067710049c2", - "reference": "049797d727261bf27f2690430d935067710049c2", + "url": "https://api.github.com/repos/composer/installers/zipball/cfcca6b1b60bc4974324efb5783c13dca6932b5b", + "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b", "shasum": "" }, "require": { @@ -170,7 +170,7 @@ "zend", "zikula" ], - "time": "2017-12-29T09:13:20+00:00" + "time": "2018-08-27T06:10:37+00:00" }, { "name": "michelf/php-markdown", @@ -222,25 +222,31 @@ "packages-dev": [ { "name": "cakephp/cakephp-codesniffer", - "version": "1.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp-codesniffer.git", - "reference": "0f3559af72fd9c2bba7310a7c4496fbb97502352" + "reference": "7f467fee00fd016b62cf8c85a57750ab2a895e81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/0f3559af72fd9c2bba7310a7c4496fbb97502352", - "reference": "0f3559af72fd9c2bba7310a7c4496fbb97502352", + "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/7f467fee00fd016b62cf8c85a57750ab2a895e81", + "reference": "7f467fee00fd016b62cf8c85a57750ab2a895e81", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "^1.4.0" + "php": ">=5.4", + "squizlabs/php_codesniffer": "^3.0.0" }, "require-dev": { - "phpunit/phpunit": "^4.1.0" + "phpunit/phpunit": "<6.0" + }, + "type": "phpcodesniffer-standard", + "autoload": { + "psr-4": { + "CakePHP\\": "CakePHP" + } }, - "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -257,7 +263,7 @@ "codesniffer", "framework" ], - "time": "2018-07-04T15:25:21+00:00" + "time": "2018-06-09T16:01:01+00:00" }, { "name": "phpunit/php-code-coverage", @@ -631,61 +637,37 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "1.5.6", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5" + "reference": "628a481780561150481a9ec74709092b9759b3ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6f3e42d311b882b25b4d409d23a289f4d3b803d5", - "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec", + "reference": "628a481780561150481a9ec74709092b9759b3ec", "shasum": "" }, "require": { + "ext-simplexml": "*", "ext-tokenizer": "*", - "php": ">=5.1.2" + "ext-xmlwriter": "*", + "php": ">=5.4.0" }, - "suggest": { - "phpunit/php-timer": "dev-master" + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "bin": [ - "scripts/phpcs" + "bin/phpcs", + "bin/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-phpcs-fixer": "2.0.x-dev" + "dev-master": "3.x-dev" } }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/CommentParser/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -696,13 +678,13 @@ "role": "lead" } ], - "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", "homepage": "http://www.squizlabs.com/php-codesniffer", "keywords": [ "phpcs", "standards" ], - "time": "2014-12-04T22:32:15+00:00" + "time": "2018-07-26T23:47:18+00:00" }, { "name": "symfony/polyfill-ctype", @@ -815,7 +797,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "b23prodtm/markdown-plugin": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": {