Skip to content

Commit

Permalink
Require markdown
Browse files Browse the repository at this point in the history
composer markdown dev-master
  • Loading branch information
b23prodtm committed Sep 23, 2018
1 parent 7aea9fc commit 1c9f07c
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 64 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/lib/Cake/Console/Templates/skel/tmp/
/plugins
/vendors
!/vendors/autoload.php
/build
/dist
/tags
Expand Down
1 change: 0 additions & 1 deletion .travis/configure
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/<plugin-name>/), call```git tag``` or ``git log``` for more information.
>_DEVELOPER TIP:_ To push tags : ```git tag`<version> && git push --tags```.
### Compatibility

Expand Down
2 changes: 1 addition & 1 deletion app/Config/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@
/**
* Load Markdown Plugin
*/
CakePlugin::load(array('Markdown' => array('bootstrap' => true)));
CakePlugin::load(array('Markdown' => array('bootstrap' => true)));
2 changes: 1 addition & 1 deletion app/Plugin/Markdown
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
},
"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",
"ext-mcrypt": "You need to install ext-openssl or ext-mcrypt to use AES-256 encryption"
},
"require-dev": {
"phpunit/phpunit": "^3",
"cakephp/cakephp-codesniffer": "^1"
"cakephp/cakephp-codesniffer": "^3"
},
"extra": {
"installer-paths": {
Expand Down
102 changes: 43 additions & 59 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1c9f07c

Please sign in to comment.