Ver Fonte

Merge remote-tracking branch 'origin/master' into php-7.4

codemasher há 6 anos atrás
pai
commit
3eaa702895
3 ficheiros alterados com 9 adições e 2 exclusões
  1. 3 1
      .travis.yml
  2. 5 0
      README.md
  3. 1 1
      composer.json

+ 3 - 1
.travis.yml

@@ -13,7 +13,9 @@ matrix:
     - php: 7.4snapshot
     - php: 7.4snapshot
     - php: nightly
     - php: nightly
 
 
-before_install: printf "\n" | pecl install imagick
+before_install:
+  - pecl channel-update pecl.php.net
+  - printf "\n" | pecl install imagick
 install: travis_retry composer install --no-interaction --prefer-source
 install: travis_retry composer install --no-interaction --prefer-source
 script: vendor/bin/phpunit --configuration phpunit.xml --coverage-clover clover.xml
 script: vendor/bin/phpunit --configuration phpunit.xml --coverage-clover clover.xml
 after_script: bash <(curl -s https://codecov.io/bash)
 after_script: bash <(curl -s https://codecov.io/bash)

+ 5 - 0
README.md

@@ -34,6 +34,11 @@ Hi, please check out my other projects that are way cooler than qrcodes!
 
 
 ## Documentation
 ## Documentation
 
 
+### Requirements
+- PHP 7.2+
+  - `ext-gd`, `ext-json`, `ext-mbstring`
+  - optional `ext-imagick`
+
 ### Installation
 ### Installation
 **requires [composer](https://getcomposer.org)**
 **requires [composer](https://getcomposer.org)**
 
 

+ 1 - 1
composer.json

@@ -34,7 +34,7 @@
 		"phpunit/phpunit": "^8.3"
 		"phpunit/phpunit": "^8.3"
 	},
 	},
 	"suggest": {
 	"suggest": {
-		"chillerlan/php-authenticator": "^3.0"
+		"chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps."
 	},
 	},
 	"autoload": {
 	"autoload": {
 		"psr-4": {
 		"psr-4": {