Update template

.gitignore

@@ -1,4 +1,7 @@
-/coverage/
-/composer.lock
-/vendor/
-/.idea/
+.vscode
+build
+composer.lock
+phpunit.xml
+vendor
+.php_cs.cache
+coverage

.php_cs

@@ -1,15 +0,0 @@
-<?php
-
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::NONE_LEVEL)
-    ->fixers([
-        "psr2",
-        "-braces",
-        "-psr0",
-    ])
-        ->finder(
-                Symfony\CS\Finder\DefaultFinder::create()
-                        ->in(__DIR__ . "/lib")
-                        ->in(__DIR__ . "/test")
-        )
-;

.php_cs.dist

@@ -0,0 +1,13 @@
+<?php
+
+$config = new Amp\CodeStyle\Config();
+$config->getFinder()
+    ->in(__DIR__ . '/examples')
+    ->in(__DIR__ . '/lib')
+    ->in(__DIR__ . '/test');
+
+$cacheDir = getenv('TRAVIS') ? getenv('HOME') . '/.php-cs-fixer' : __DIR__;
+
+$config->setCacheFile($cacheDir . '/.php_cs.cache');
+
+return $config;

.travis.yml

@@ -3,22 +3,37 @@ sudo: false
 language: php
 
 php:
-  - 5.5
-  - 5.6
-  - 7
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
+  - nightly
 
-before_script:
-  - composer self-update
-  - composer require satooshi/php-coveralls:dev-master
-  - composer install
+matrix:
+  allow_failures:
+    - php: nightly
+  fast_finish: true
+
+env:
+  - AMP_DEBUG=true
+
+before_install:
+  - phpenv config-rm xdebug.ini || echo "No xdebug config."
+
+install:
+  - composer update -n --prefer-dist
+  - wget https://github.com/php-coveralls/php-coveralls/releases/download/v1.0.2/coveralls.phar
+  - chmod +x coveralls.phar
 
 script:
-  - $(php -r 'if (PHP_MAJOR_VERSION >= 7) echo "phpdbg -qrr"; else echo "php";') vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
-  - php vendor/bin/php-cs-fixer --diff --dry-run -v fix
+  - vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
+  - PHP_CS_FIXER_IGNORE_ENV=1 php vendor/bin/php-cs-fixer --diff --dry-run -v fix
 
 after_script:
-  - php vendor/bin/coveralls -v
+  - ./coveralls.phar -v
 
 cache:
   directories:
     - $HOME/.composer/cache
+    - $HOME/.php-cs-fixer
+    - $HOME/.local

appveyor.yml

@@ -0,0 +1,38 @@
+build: false
+shallow_clone: false
+
+platform:
+  - x86
+  - x64
+
+clone_folder: c:\projects\amphp
+
+cache:
+  - c:\tools\php73 -> appveyor.yml
+
+init:
+  - SET PATH=C:\Program Files\OpenSSL;c:\tools\php73;%PATH%
+  - SET COMPOSER_NO_INTERACTION=1
+  - SET PHP=1
+  - SET ANSICON=121x90 (121x90)
+
+install:
+  - IF EXIST c:\tools\php73 (SET PHP=0)
+  - IF %PHP%==1 sc config wuauserv start= auto
+  - IF %PHP%==1 net start wuauserv
+  - IF %PHP%==1 cinst -y OpenSSL.Light
+  - IF %PHP%==1 cinst -y php
+  - cd c:\tools\php73
+  - IF %PHP%==1 copy php.ini-production php.ini /Y
+  - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
+  - IF %PHP%==1 echo extension_dir=ext >> php.ini
+  - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+  - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
+  - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
+  - cd c:\projects\amphp
+  - appveyor DownloadFile https://getcomposer.org/composer.phar
+  - php composer.phar install --prefer-dist --no-progress
+
+test_script:
+  - cd c:\projects\amphp
+  - vendor/bin/phpunit --colors=always

composer.json

@@ -1,25 +1,45 @@
 {
     "name": "amphp/template",
     "license": "MIT",
-  "authors": [
-    {
+    "description": "Template for AMPHP libraries",
+    "authors": [{
         "name": "...",
         "email": "..."
-    }
-  ],
+    }],
     "support": {
         "issues": "https://github.com/amphp/template/issues"
     },
     "require": {
-    "amphp/amp": "^1"
+        "php": ">=7.0",
+        "amphp/amp": "^2"
     },
     "require-dev": {
-    "phpunit/phpunit": "~4.4.0",
-    "friendsofphp/php-cs-fixer": "~1.9"
+        "amphp/phpunit-util": "^1",
+        "phpunit/phpunit": "^6",
+        "amphp/php-cs-fixer-config": "dev-master"
     },
     "autoload": {
         "psr-4": {
             "Amp\\Template\\": "lib/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Amp\\Template\\Test\\": "test"
+        }
+    },
+    "config": {
+        "platform": {
+            "php": "7.0.0"
+        }
+    },
+    "scripts": {
+        "check": [
+            "@cs",
+            "@test"
+        ],
+        "cs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix -v --diff --dry-run",
+        "cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix -v --diff",
+        "test": "@php -dzend.assertions=1 -dassert.exception=1 ./vendor/bin/phpunit --coverage-text"
     }
 }

phpunit.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-    <testsuites>
-        <testsuite name="Tests">
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>./lib</directory>
-        </whitelist>
-    </filter>
-</phpunit>

phpunit.xml.dist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.0/phpunit.xsd"
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        bootstrap="vendor/autoload.php"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+>
+    <testsuites>
+        <testsuite name="Main">
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">lib</directory>
+        </whitelist>
+    </filter>
+    <listeners>
+        <listener class="Amp\PHPUnit\LoopReset"/>
+    </listeners>
+</phpunit>