axypro · vasa-c · Apr 15, 2022 · Apr 9, 2022 · Apr 9, 2022 · Apr 9, 2022
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
+
+[*.{php,xml,json}]
+indent_size = 4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,30 @@
+name: PHP Tests
+
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php: [7.3, 7.4, 8.0, 8.1]
+
+    name: 'PHP ${{ matrix.php }}'
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
+          tools: phpunit, composer:v2
+          ini-values: display_errors=E_ALL
+
+      - name: Install Composer dependencies
+        run: composer install
+
+      - name: Run Composer tests
+        run: composer test
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ phpmd.xml
 .idea
 tests/tmp/*
 !tests/tmp/.gitkeep
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -12,13 +12,10 @@ language: php
 
 matrix:
   include:
-    - php: 5.6
-      env: CHECKS=yes PU4=yes
-    - php: 7.0
-    - php: 7.1
-    - php: 7.2
     - php: 7.3
     - php: 7.4
+    - php: 8.0
+    - php: 8.1
 
 sudo: false
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Oleg Grigoriev
+Copyright (c) 2022 Sami Mazouz Copyright (c) 2015 Oleg Grigoriev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 The library for work with Source Map files from PHP.
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/axy/sourcemap.svg?style=flat-square)](https://packagist.org/packages/axy/sourcemap)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.4-8892BF.svg?style=flat-square)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.3-8892BF.svg?style=flat-square)](https://php.net/)
 [![Build Status](https://img.shields.io/travis/axypro/sourcemap/master.svg?style=flat-square)](https://travis-ci.org/axypro/sourcemap)
 [![Coverage Status](https://coveralls.io/repos/axypro/sourcemap/badge.svg?branch=master&service=github)](https://coveralls.io/github/axypro/sourcemap?branch=master)
 [![License](https://poser.pugx.org/axy/sourcemap/license)](LICENSE)

diff --git a/composer.json b/composer.json
@@ -17,14 +17,27 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=7.3",
         "ext-json": "*",
-        "axy/errors": "~1.0.1",
-        "axy/codecs-base64vlq": "~1.0.0"
+        "axy/errors": "^3.0",
+        "axy/codecs-base64vlq": "^2.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
-            "axy\\sourcemap\\": ""
+            "axy\\sourcemap\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "axy\\sourcemap\\tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": "phpunit -c phpunit.xml.dist",
+        "md": "phpmd --exclude vendor . text phpmd.xml.dist",
+        "cs": "phpcs --standard=PSR2 --encoding=utf-8 --ignore=vendor ."
     }
 }
diff --git a/cs.sh b/cs.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env sh
 
 /usr/bin/env phpcs --standard=PSR2 --encoding=utf-8 --ignore=vendor .
-
diff --git a/index.php b/index.php
diff --git a/phpmd.sh b/phpmd.sh
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         beStrictAboutTestsThatDoNotTestAnything="false"
 >
-    <testsuites>
-        <testsuite name="Base Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <blacklist>
-            <directory>./vendor/</directory>
-        </blacklist>
-    </filter>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Base Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
 
diff --git a/PosGenerated.php → src/PosGenerated.php b/PosGenerated.php → src/PosGenerated.php
diff --git a/PosMap.php → src/PosMap.php b/PosMap.php → src/PosMap.php
diff --git a/PosSource.php → src/PosSource.php b/PosSource.php → src/PosSource.php
diff --git a/SourceMap.php → src/SourceMap.php b/SourceMap.php → src/SourceMap.php
diff --git a/errors/Error.php → src/errors/Error.php b/errors/Error.php → src/errors/Error.php
diff --git a/errors/IOError.php → src/errors/IOError.php b/errors/IOError.php → src/errors/IOError.php
diff --git a/errors/IncompleteData.php → src/errors/IncompleteData.php b/errors/IncompleteData.php → src/errors/IncompleteData.php
diff --git a/errors/InvalidFormat.php → src/errors/InvalidFormat.php b/errors/InvalidFormat.php → src/errors/InvalidFormat.php
diff --git a/errors/InvalidIndexed.php → src/errors/InvalidIndexed.php b/errors/InvalidIndexed.php → src/errors/InvalidIndexed.php
diff --git a/errors/InvalidJSON.php → src/errors/InvalidJSON.php b/errors/InvalidJSON.php → src/errors/InvalidJSON.php
diff --git a/errors/InvalidMappings.php → src/errors/InvalidMappings.php b/errors/InvalidMappings.php → src/errors/InvalidMappings.php
diff --git a/errors/InvalidSection.php → src/errors/InvalidSection.php b/errors/InvalidSection.php → src/errors/InvalidSection.php
diff --git a/errors/OutFileNotSpecified.php → src/errors/OutFileNotSpecified.php b/errors/OutFileNotSpecified.php → src/errors/OutFileNotSpecified.php
diff --git a/errors/UnsupportedVersion.php → src/errors/UnsupportedVersion.php b/errors/UnsupportedVersion.php → src/errors/UnsupportedVersion.php
diff --git a/helpers/IO.php → src/helpers/IO.php b/helpers/IO.php → src/helpers/IO.php
diff --git a/helpers/MapBuilder.php → src/helpers/MapBuilder.php b/helpers/MapBuilder.php → src/helpers/MapBuilder.php
diff --git a/helpers/PosBuilder.php → src/helpers/PosBuilder.php b/helpers/PosBuilder.php → src/helpers/PosBuilder.php
diff --git a/indexed/Base.php → src/indexed/Base.php b/indexed/Base.php → src/indexed/Base.php
diff --git a/indexed/Names.php → src/indexed/Names.php b/indexed/Names.php → src/indexed/Names.php
diff --git a/indexed/Sources.php → src/indexed/Sources.php b/indexed/Sources.php → src/indexed/Sources.php
diff --git a/parents/Base.php → src/parents/Base.php b/parents/Base.php → src/parents/Base.php
diff --git a/parents/Interfaces.php → src/parents/Interfaces.php b/parents/Interfaces.php → src/parents/Interfaces.php
@@ -6,6 +6,8 @@
 
 namespace axy\sourcemap\parents;
 
+use Traversable;
+
 /**
  * Partition of the SourceMap class (interfaces implementations)
  */
@@ -14,22 +16,23 @@ abstract class Interfaces extends Magic implements \IteratorAggregate, \ArrayAcc
     /**
      * {@inheritdoc}
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new \ArrayIterator($this->getData());
     }
 
     /**
      * {@inheritdoc}
      */
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return $this->__isset($offset);
     }
 
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->__get($offset);
@@ -38,22 +41,23 @@ public function offsetGet($offset)
     /**
      * {@inheritdoc}
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->__set($offset, $value);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         $this->__unset($offset);
     }
 
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getData();
@@ -64,9 +68,7 @@ public function jsonSerialize()
      */
     public function serialize()
     {
-        $data = $this->getData();
-        $data['mappings_serialized'] = $this->context->getMappings();
-        return serialize($data);
+        return serialize($this->__serialize());
     }
 
     /**
@@ -76,4 +78,22 @@ public function unserialize($serialized)
     {
         $this->__construct(unserialize($serialized));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __serialize(): array
+    {
+        $data = $this->getData();
+        $data['mappings_serialized'] = $this->context->getMappings();
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __unserialize(array $serialized): void
+    {
+        $this->__construct($serialized);
+    }
 }
diff --git a/parents/Magic.php → src/parents/Magic.php b/parents/Magic.php → src/parents/Magic.php
@@ -118,7 +118,7 @@ public function __toString()
     /**
      * {@inheritdoc}
      */
-    public function count()
+    public function count(): int
     {
         return count($this->getData());
     }

diff --git a/parsing/Context.php → src/parsing/Context.php b/parsing/Context.php → src/parsing/Context.php
diff --git a/parsing/FormatChecker.php → src/parsing/FormatChecker.php b/parsing/FormatChecker.php → src/parsing/FormatChecker.php
diff --git a/parsing/Line.php → src/parsing/Line.php b/parsing/Line.php → src/parsing/Line.php
diff --git a/parsing/Mappings.php → src/parsing/Mappings.php b/parsing/Mappings.php → src/parsing/Mappings.php
diff --git a/parsing/SegmentParser.php → src/parsing/SegmentParser.php b/parsing/SegmentParser.php → src/parsing/SegmentParser.php
diff --git a/tests/PosMapTest.php b/tests/PosMapTest.php
@@ -13,7 +13,7 @@
 /**
  * coversDefaultClass axy\sourcemap\PosMap
  */
-class PosMapTest extends \PHPUnit_Framework_TestCase
+class PosMapTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * covers ::__construct
@@ -116,11 +116,13 @@ public function providerCreate()
 
     /**
      * covers ::__construct
-     * @expectedException \InvalidArgumentException
+     *
      * @return \axy\sourcemap\PosMap
      */
     public function testCreateInvalidArgument()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         return new PosMap(3);
     }
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/tests/classSourceMap/AddTest.php b/tests/classSourceMap/AddTest.php
@@ -6,6 +6,8 @@
 
 namespace axy\sourcemap\tests\classSourceMap;
 
+use axy\sourcemap\errors\IncompleteData;
+use axy\sourcemap\errors\InvalidIndexed;
 use axy\sourcemap\SourceMap;
 use axy\sourcemap\PosMap;
 use axy\sourcemap\PosGenerated;
@@ -15,7 +17,7 @@
 /**
  * coversDefaultClass axy\sourcemap\SourceMap
  */
-class AddTest extends \PHPUnit_Framework_TestCase
+class AddTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var array
@@ -37,7 +39,7 @@ class AddTest extends \PHPUnit_Framework_TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->map = new SourceMap($this->data);
     }
@@ -156,8 +158,9 @@ public function testAddPositionArray()
     public function testErrorIncompleteData($position, $error = true)
     {
         if ($error) {
-            $this->setExpectedException('axy\sourcemap\errors\IncompleteData');
+            $this->expectException(IncompleteData::class);
         }
+
         $this->map->addPosition($position);
     }
 
@@ -221,7 +224,7 @@ public function providerErrorIncompleteData()
     public function testErrorInvalidIndexed($position, $error = true)
     {
         if ($error) {
-            $this->setExpectedException('axy\sourcemap\errors\InvalidIndexed');
+            $this->expectException(InvalidIndexed::class);
         }
         $this->map->addPosition($position);
     }

diff --git a/tests/classSourceMap/BlockTest.php b/tests/classSourceMap/BlockTest.php
@@ -12,7 +12,7 @@
 /**
  * coversDefaultClass axy\sourcemap\SourceMap
  */
-class BlockTest extends \PHPUnit_Framework_TestCase
+class BlockTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var array
@@ -40,7 +40,7 @@ class BlockTest extends \PHPUnit_Framework_TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->posList = [];
         $this->map = new SourceMap();

diff --git a/tests/classSourceMap/ChangeTest.php b/tests/classSourceMap/ChangeTest.php
@@ -11,7 +11,7 @@
 /**
  * coversDefaultClass axy\sourcemap\SourceMap
  */
-class ChangeTest extends \PHPUnit_Framework_TestCase
+class ChangeTest extends \PHPUnit\Framework\TestCase
 {
     public function testFileRename()
     {
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		#!/usr/bin/env sh

		/usr/bin/env phpcs --standard=PSR2 --encoding=utf-8 --ignore=vendor .