set the correct PHPUnit setting

wapmorgan · Mar 6, 2018 · a2f2f71 · a2f2f71
1 parent 8cba64c
commit a2f2f71
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,12 @@
 language: php
-dist: trusty
+
 php:
 - 5.4
 - 5.5
 - 5.6
 - 7.0
 - 7.1
+- 7.2
 - hhvm
 
 before_script:

diff --git a/composer.json b/composer.json
@@ -8,7 +8,12 @@
             "wapmorgan\\FileTypeDetector\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "wapmorgan\\FileTypeDetector\\": "tests/"
+        }
+    },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.35"
+        "phpunit/phpunit": "^4.8"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php" colors="true" backupGlobals="false" 
+         backupStaticAttributes="false" syntaxCheck="false">
+    <testsuites>
+        <testsuite name="Tests">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Detector.php b/src/Detector.php
@@ -105,7 +105,7 @@ class Detector {
 
     const REG = 'reg';
 
-    static protected $aliases = array(
+    protected static $aliases = array(
         'jpg' => self::JPEG,
         'tif' => self::TIFF,
         'mpg' => self::MPEG,
@@ -116,7 +116,7 @@ class Detector {
         'mid' => self::MIDI,
     );
 
-    static protected $extensions = array(
+    protected static $extensions = array(
         'jpeg' => self::JPEG,
         'bmp' => self::BMP,
         'gif' => self::GIF,
@@ -194,7 +194,7 @@ class Detector {
         'reg' => self::REG,
     );
 
-    static protected $types = array(
+    protected static $types = array(
         self::IMAGE => array(
             self::JPEG,
             self::BMP,
@@ -311,7 +311,7 @@ class Detector {
         ),
     );
 
-    static protected $mimeTypes = array(
+    protected static $mimeTypes = array(
         self::JPEG => 'image/jpeg',
         self::BMP => 'image/bmp',
         self::GIF => 'image/gif',
@@ -399,7 +399,7 @@ class Detector {
         self::REG => 'text/plain',
     );
 
-    static protected $signatures = [
+    protected static $signatures = [
         // Images signatures
         self::JPEG => [[0 => [0xFF, 0xD8, 0xFF, 0xE0]]],
         self::BMP => [[0 => [0x42, 0x4D]]],
@@ -671,7 +671,7 @@ class Detector {
         ]
     ];
 
-    static public function detectByFilename($filename) {
+    public static function detectByFilename($filename) {
         $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
         if (isset(self::$aliases[$ext])) $ext = self::$aliases[$ext];
         if (isset(self::$extensions[$ext])) {
@@ -688,7 +688,7 @@ static public function detectByFilename($filename) {
         return false;
     }
 
-    static public function detectByContent($source) {
+    public static function detectByContent($source) {
         $stream = new ContentStream($source);
         foreach (self::$signatures as $format => $signatures) {
             foreach ($signatures as $or_signature) {
@@ -729,7 +729,7 @@ static public function detectByContent($source) {
         return false;
     }
 
-    static public function getMimeType($file) {
+    public static function getMimeType($file) {
         $format = self::detectByFilename($file) ?: self::detectByContent($file);
         if ($format === false)
             return false;

diff --git a/src/TerminalInfo.php b/src/TerminalInfo.php
@@ -4,7 +4,7 @@
 class TerminalInfo {
     const WIDTH = 1;
     const HEIGHT = 2;
-    static public function isInteractive() {
+    public static function isInteractive() {
         if (strncasecmp(PHP_OS, 'win', 3) === 0) {
             // windows has no test for that
             return true;
@@ -18,29 +18,29 @@ static public function isInteractive() {
         }
     }
 
-    static public function getWidth() {
+    public static function getWidth() {
         if (strncasecmp(PHP_OS, 'win', 3) === 0) {
             return self::getWindowsTerminalSize(self::WIDTH);
         } else {
             return self::getUnixTerminalSize(self::WIDTH);
         }
     }
 
-    static public function getHeight() {
+    public static function getHeight() {
         if (strncasecmp(PHP_OS, 'win', 3) === 0) {
             return self::getWindowsTerminalSize(self::HEIGHT);
         } else {
             return self::getUnixTerminalSize(self::HEIGHT);
         }
     }
 
-    static protected function getWindowsTerminalSize($param) {
+    protected static function getWindowsTerminalSize($param) {
         $output = explode("\n", shell_exec('mode'));
         $line = explode(':', trim($param == self::WIDTH ? $output[4] : $output[3]));
         return trim($line[1]);
     }
 
-    static protected function getUnixTerminalSize($param) {
+    protected static function getUnixTerminalSize($param) {
         return trim(shell_exec('tput '.($param == self::WIDTH ? 'cols' : 'linus')));
     }
 }
diff --git a/tests/DetectorTest.php b/tests/DetectorTest.php
@@ -1,11 +1,10 @@
 <?php
 namespace wapmorgan\test\FileTypeDetector;
-require __DIR__.'/../vendor/autoload.php';
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use wapmorgan\FileTypeDetector\Detector;
 
-class DetectorTest extends PHPUnit_Framework_TestCase {
+class DetectorTest extends TestCase {
     /**
      * @dataProvider filenamesWithTypes()
      */