Convert code style to PSR-2

Author: kelunik

.php_cs.dist

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

.travis.yml

@@ -0,0 +1,36 @@
+sudo: false
+
+language: php
+
+php:
+ - 7.0
+ - 7.1
+ - 7.2
+ - 7.3
+ - 7.4snapshot
+ - nightly
+
+matrix:
+ allow_failures:
+ - php: nightly
+ fast_finish: true
+
+env:
+ - AMP_DEBUG=true
+
+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:
+ - 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:
+ - ./coveralls.phar -v
+
+cache:
+ directories:
+ - $HOME/.composer/cache/files
+ - $HOME/.php-cs-fixer

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 amphp
+Copyright (c) 2017-2019 amphp
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -17,7 +17,8 @@
  "phpunit/phpunit": "^6"
  },
  "require-dev": {
- "amphp/amp": "^2"
+ "amphp/amp": "^2",
+ "amphp/php-cs-fixer-config": "dev-master"
  },
  "autoload": {
  "psr-4": {

src/CallbackStub.php

@@ -2,6 +2,10 @@
 
 namespace Amp\PHPUnit;
 
-class CallbackStub {
- public function __invoke() {}
+class CallbackStub
+{
+ public function __invoke()
+ {
+ // nothing
+ }
 }

src/LoopReset.php

@@ -6,8 +6,10 @@
 use PHPUnit\Framework\BaseTestListener;
 use PHPUnit\Framework\Test;
 
-class LoopReset extends BaseTestListener {
- public function endTest(Test $test, $time) {
+class LoopReset extends BaseTestListener
+{
+ public function endTest(Test $test, $time)
+ {
  Loop::set((new Loop\DriverFactory)->create());
  gc_collect_cycles(); // extensions using an event loop may otherwise leak the file descriptors to the loop
  }

src/TestCase.php

@@ -5,7 +5,8 @@
 /**
  * Abstract test class with methods for creating callbacks and asserting runtimes.
  */
-abstract class TestCase extends \PHPUnit\Framework\TestCase {
+abstract class TestCase extends \PHPUnit\Framework\TestCase
+{
  const RUNTIME_PRECISION = 2; // Number of decimals to use in runtime calculations/comparisons.
 
  /**
@@ -16,7 +17,8 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
  * @return callable|\PHPUnit_Framework_MockObject_MockObject Object that is callable and expects to be called the
  * given number of times.
  */
- public function createCallback(int $count): callable {
+ public function createCallback(int $count): callable
+ {
  $mock = $this->createMock(CallbackStub::class);
 
  $mock->expects($this->exactly($count))
@@ -30,33 +32,24 @@ public function createCallback(int $count): callable {
  *
  * @param callable $callback
  * @param int $maxRunTime Max runtime allowed for the test to pass.
- * @param mixed[] $args  Function arguments.
+ * @param mixed[] $args Function arguments.
  */
- public function assertRunTimeLessThan(callable $callback, int $maxRunTime, array $args = []) {
+ public function assertRunTimeLessThan(callable $callback, int $maxRunTime, array $args = [])
+ {
  $this->assertRunTimeBetween($callback, 0, $maxRunTime, $args);
  }
 
- /**
- * Asserts that the given callback takes more than $minRunTime to run.
- *
- * @param callable $callback
- * @param int $minRunTime Minimum runtime allowed for the test to pass.
- * @param mixed[] $args Function arguments.
- */
- public function assertRunTimeGreaterThan(callable $callback, int $minRunTime, array $args = []) {
- $this->assertRunTimeBetween($callback, $minRunTime, 0, $args);
- }
-
  /**
  * Asserts that the given callback takes between $minRunTime and $maxRunTime to execute.
  * Rounds to the nearest 100 ms.
  *
  * @param callable $callback
  * @param int $minRunTime Minimum runtime allowed for the test to pass.
  * @param int $maxRunTime Max runtime allowed for the test to pass.
- * @param mixed[] $args  Function arguments.
+ * @param mixed[] $args Function arguments.
  */
- public function assertRunTimeBetween(callable $callback, int $minRunTime, int $maxRunTime, array $args = []) {
+ public function assertRunTimeBetween(callable $callback, int $minRunTime, int $maxRunTime, array $args = [])
+ {
  $start = \microtime(true);
 
  $callback(...$args);
@@ -80,14 +73,27 @@ public function assertRunTimeBetween(callable $callback, int $minRunTime, int $m
  }
  }
 
+ /**
+ * Asserts that the given callback takes more than $minRunTime to run.
+ *
+ * @param callable $callback
+ * @param int $minRunTime Minimum runtime allowed for the test to pass.
+ * @param mixed[] $args Function arguments.
+ */
+ public function assertRunTimeGreaterThan(callable $callback, int $minRunTime, array $args = [])
+ {
+ $this->assertRunTimeBetween($callback, $minRunTime, 0, $args);
+ }
+
  /**
  * Runs the given callback in a separate fork.
  *
  * @param callable $function
  *
  * @return int
  */
- final protected function doInFork(callable $function) {
+ final protected function doInFork(callable $function)
+ {
  switch ($pid = \pcntl_fork()) {
  case -1:
  $this->fail('Failed to fork process.');

src/TestException.php

@@ -13,5 +13,7 @@
  * $this->assertSame($expectedExceptionInstance, $e);
  * }
  */
-class TestException extends \Exception {
+class TestException extends \Exception
+{
+ // nothing
 }