Merge branch 'develop' into meta_updates

Author: noplanman

.travis.yml

@@ -45,7 +45,7 @@ before_script:
 
 script:
   - composer check-code
-  - if [[ "$CODECOV" == "1" ]]; then composer test-cov-live; else composer test; fi
+  - if [[ "$CODECOV" == "1" ]]; then composer test-cov; else composer test; fi
 
 after_success:
   - if [[ "$CODECOV" == "1" ]]; then composer test-cov-upload; fi

CHANGELOG.md

@@ -6,6 +6,8 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ## [Unreleased]
 ### Added
 ### Changed
+- Upgraded dependencies and bumped core to version 0.59.0.
+- Code style is now PSR12.
 - Adopt issue templates and git/GitHub related meta from upstream core.
 ### Deprecated
 ### Removed

README.md

@@ -47,7 +47,7 @@ It is possible however, to override the core version that this library requires:
 ```yaml
 "require": {
     "php-telegram-bot/telegram-bot-manager": "^1.4",
-    "longman/telegram-bot": "dev-develop as 0.57"
+    "longman/telegram-bot": "dev-develop as 0.59"
 }
 ```
 

composer.json

@@ -19,12 +19,13 @@
     ],
     "require": {
         "php": "^7.1",
-        "longman/telegram-bot": "^0.57",
-        "longman/ip-tools": "^1.2"
+        "longman/telegram-bot": "^0.59",
+        "longman/ip-tools": "^1.2",
+        "psr/log": "^1.1"
     },
     "require-dev": {
         "jakub-onderka/php-parallel-lint": "^1.0",
-        "phpunit/phpunit": "^7.5|^8.1",
+        "phpunit/phpunit": "^7.5|^8.2",
         "squizlabs/php_codesniffer": "^3.4"
     },
     "autoload": {
@@ -40,7 +41,7 @@
     "scripts": {
         "check-code": [
             "vendor/bin/parallel-lint . --exclude vendor",
-            "vendor/bin/phpcs --standard=psr2 src/ tests/ -snp --encoding=utf-8 --report-width=150"
+            "vendor/bin/phpcs -snp src/ tests/"
         ],
         "test": [
             "vendor/bin/phpunit --exclude-group live"
@@ -49,10 +50,10 @@
             "vendor/bin/phpunit"
         ],
         "test-cov": [
-            "vendor/bin/phpunit --coverage-clover=coverage.xml --exclude-group live"
+            "vendor/bin/phpunit --coverage-clover coverage.xml --exclude-group live"
         ],
         "test-cov-live": [
-            "vendor/bin/phpunit --coverage-clover=coverage.xml"
+            "vendor/bin/phpunit --coverage-clover coverage.xml"
         ],
         "test-cov-upload": [
             "curl -s https://codecov.io/bash | bash"

composer.lock

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="PHP Telegram Bot Manager">
+    <description>PHP Code Sniffer</description>
+
+    <arg name="colors"/>
+    <arg name="parallel" value="8"/>
+    <arg name="encoding" value="utf-8"/>
+    <arg name="report-width" value="150"/>
+
+    <rule ref="PSR12"/>
+</ruleset>

phpcs.xml.dist

@@ -27,7 +27,7 @@
     <php>
         <ini name="date.timezone" value="UTC"/>
         <ini name="error_reporting" value="-1"/>
-        <const name="PHPUNIT_TEST" value="true"/>
+        <const name="PHPUNIT_TESTSUITE" value="true"/>
         <const name="PHPUNIT_DB_HOST" value="127.0.0.1"/>
         <const name="PHPUNIT_DB_USER" value="root"/>
         <const name="PHPUNIT_DB_PASSWORD" value=""/>