Merge master into 1.0.x

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/stale.yml

@@ -0,0 +1,13 @@
+daysUntilStale: 180
+daysUntilClose: 28
+exemptLabels:
+  - keep-open
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed after 4 weeks if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/.editorconfig

@@ -0,0 +1,2 @@
+[*.yml]
+indent_size = 2

.github/workflows/run-tests.yml

@@ -0,0 +1,31 @@
+name: The PHP League Tests
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-20.04]
+        php: [7.4, 8.0, 8.1]
+
+    name: League - PHP ${{ matrix.php }} on ${{ matrix.os }}
+
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: phpcs, phpunit
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v2
+
+      - name: Run Tests
+        run: vendor/bin/phpunit

.github/workflows/static.yml

@@ -0,0 +1,46 @@
+on: [ pull_request ]
+name: Static analysis
+
+jobs:
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: apcu, redis
+          coverage: none
+          tools: phpstan:1.4.6, cs2pr
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+
+      - name: PHPStan
+        run: phpstan analyze --no-progress --error-format=checkstyle | cs2pr
+
+  psalm:
+    name: Psalm
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: apcu, redis
+          coverage: none
+          tools: vimeo/psalm:4.22.0
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+
+      - name: Psalm
+        run: psalm --no-progress --output-format=github

.github/workflows/style-checker.yml

@@ -0,0 +1,32 @@
+name: The PHP League Style Checks
+
+on: [push, pull_request]
+
+jobs:
+  style:
+    runs-on: ubuntu-latest
+    name: The PHP League Style Checks
+    steps:
+
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+
+      - name: Cache Dependencies
+        id: composer-cache-style
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ubuntu-composer-cache-style-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ubuntu-php-style
+
+      - name: Install Dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Check Coding Style
+        run: vendor/bin/phpcs src/

.gitignore

@@ -4,5 +4,4 @@
 composer.lock
 build
 vendor
-Gemfile.lock
-coverage
+.phpunit.result.cache

CHANGELOG.md

@@ -1,3 +1,11 @@
+## Next
+
+### Enhancements
+- Add links for all available includes to `JsonApiSerializer` #331 - Thanks @matt-allan
+- Implement interface `\JsonSerializable` in Scopes to allow for direct usage with `json_encode()`
+
+
+
 ## 0.18.0 - 2019-05-09
 
 ### Enhancements

README.md

@@ -2,10 +2,7 @@
 
 [![Latest Version](https://img.shields.io/github/release/thephpleague/fractal.svg?style=flat-square)](https://github.com/thephpleague/fractal/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
-[![Build Status](https://img.shields.io/travis/thephpleague/fractal/1.0.x.svg?style=flat-square&label=tests)](https://travis-ci.org/thephpleague/fractal)
-[![Build Status](https://img.shields.io/circleci/build/gh/thephpleague/fractal/1.0.x.svg?style=flat-square&label=code+style)](https://circleci.com/gh/thephpleague/fractal)
-[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/thephpleague/fractal/1.0.x.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/fractal/code-structure)
-[![Quality Score](https://img.shields.io/scrutinizer/g/thephpleague/fractal/1.0.x.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/fractal)
+![The PHP League Tests](https://github.com/thephpleague/fractal/workflows/The%20PHP%20League%20Tests/badge.svg)
 [![Total Downloads](https://img.shields.io/packagist/dt/league/fractal.svg?style=flat-square)](https://packagist.org/packages/league/fractal)
 
 Fractal provides a presentation and transformation layer for complex data output, the like found in
@@ -42,15 +39,9 @@ $ composer require league/fractal
 
 ## Requirements
 
-The following versions of PHP are supported by this version.
+The following versions of PHP are supported by this version:
 
-* PHP 5.4
-* PHP 5.5
-* PHP 5.6
-* PHP 7.0
-* PHP 7.1
-* PHP 7.2
-* HHVM
+>= PHP 7.4
 
 ## Documentation
 
@@ -72,6 +63,12 @@ $ phpunit
 
 Please see [CONTRIBUTING](https://github.com/thephpleague/fractal/blob/master/CONTRIBUTING.md) and [CONDUCT](https://github.com/thephpleague/fractal/blob/master/CONDUCT.md) for details.
 
+
+## Maintainers
+
+- [Korvin Szanto](https://github.com/korvinszanto)
+- [Matt Trask](https://github.com/matthewtrask)
+
 ## Credits
 
 - [Graham Daniels](https://github.com/greydnls)

composer.json

@@ -21,13 +21,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.2"
+        "php": ">=7.4"
     },
     "require-dev": {
-        "mockery/mockery": "~1.0",
-        "phpstan/phpstan": "^0.11.8",
-        "phpunit/phpunit": "~8.0",
-        "squizlabs/php_codesniffer": "~3.4"
+        "mockery/mockery": ">=1.5",
+        "phpstan/phpstan": ">=1.5",
+        "phpunit/phpunit": ">=8|>=9",
+        "squizlabs/php_codesniffer": "~3.6",
+        "vimeo/psalm": "^4.22"
     },
     "suggest": {
         "league/fractal-serializer-jsonapi": "JSON:API Serialization Support",
@@ -47,9 +48,14 @@
             "League\\Fractal\\Test\\": "test"
         }
     },
+    "scripts": {
+        "check": "vendor/bin/phpcs src/",
+        "test": "vendor/bin/phpunit --testdox --colors=always",
+        "test:coverage": "vendor/bin/phpunit --coverage-html build/coverage"
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.13-dev"
+            "dev-master": "0.20.x-dev"
         }
     }
 }

phpcs.xml.dist

@@ -10,11 +10,4 @@
 
   <!-- Use the PSR2 Standard-->
   <rule ref="PSR12" />
-
-  <rule ref="Generic.Files.LineLength">
-    <properties>
-      <property name="lineLimit" value="1000"/>
-      <property name="absoluteLineLimit" value="0"/>
-    </properties>
-  </rule>
 </ruleset>

phpstan-baseline.neon

@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$separator of function explode expects non\\-empty\\-string, string given\\.$#"
+			count: 1
+			path: src/Manager.php

phpstan.neon.dist

@@ -0,0 +1,8 @@
+includes:
+  - ./phpstan-baseline.neon
+
+parameters:
+  level: 5
+  reportUnmatchedIgnoredErrors: false
+  paths:
+    - src

psalm.baseline.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
+  <file src="src/Scope.php">
+    <UndefinedInterfaceMethod occurrences="1">
+      <code>getMeta</code>
+    </UndefinedInterfaceMethod>
+    <UndefinedMethod occurrences="1">
+      <code>transform</code>
+    </UndefinedMethod>
+  </file>
+</files>

psalm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="4"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm.baseline.xml"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>