diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d3425a..dc668a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,22 +1,13 @@
name: CI
on: ['push', 'pull_request']
jobs:
- phpstan:
- name: PHP Static Analysis
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: PHPStan
- uses: docker://oskarstark/phpstan-ga
- with:
- args: analyse src/ -c phpstan.neon
- tests:
- name: Unit Tests for PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+ ci:
+ name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- php: ['7.4', '8.0', '8.1']
+ os: [ubuntu-latest, macos-latest]
+ php: ['8.1']
dependency-version: [prefer-stable]
steps:
@@ -27,7 +18,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
- extensions: fileinfo, spl, json, dom, mbstring, pcntl
+ extensions: pcntl, mcrypt, openssl
ini-values: disable_functions, error_reporting=E_ALL
tools: composer:v2
coverage: xdebug
@@ -37,28 +28,17 @@ jobs:
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
- - name: Install PHP 7 dependencies
+ - name: Install PHP 8.1 dependencies
run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress
- if: "matrix.php < 8"
-
- - name: Install PHP 8 dependencies
- if: "matrix.php >= 8"
- run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress
-
- - name: Run Tests for PHP 7.4
- if: "matrix.php == 7.4"
- run: ./vendor/bin/pest --coverage
-
- - name: Run Tests for PHP 8.0
- if: "matrix.php == 8.0"
- run: ./vendor/bin/pest --coverage
-
+
+ - name: PHP Static Analysis for PHP 8.1
+ run: ./vendor/bin/phpstan
+
- name: Run Tests for PHP 8.1
- if: "matrix.php == 8.1"
run: ./vendor/bin/pest --coverage
support:
- needs: [phpstan, tests]
+ needs: [ci]
name: Discord Notification
runs-on: ubuntu-latest
steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3acfc45..ce8a01f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
+
+# [5.0.0](https://github.com/glowyphp/registry) (2022-07-03)
+* Moving to PHP 8.1
+* Use union types.
+
-# [4.0.0](https://github.com/glowyphp/csrf) (2021-12-23)
+# [4.0.0](https://github.com/glowyphp/registry) (2021-12-23)
* Released under Glowy PHP Organization.
* Add PHP 8.1 support.
* Updated dependencies.
diff --git a/LICENSE b/LICENSE
index 3c0b5d5..fe6848d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2022 Sergey Romanenko
+Copyright (c) Sergey Romanenko
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
index f42efa5..c3ac416 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,7 @@ Registry Package provides a fluent, object-oriented interface for storing data g
-
-
-
+
diff --git a/composer.json b/composer.json
index ead0dc0..3b36b16 100644
--- a/composer.json
+++ b/composer.json
@@ -12,13 +12,13 @@
"authors": [
{
"name": "Sergey Romanenko",
- "email": "sergey.romanenko@flextype.org",
- "homepage": "https://github.com/Awilum"
+ "email": "awilum@msn.com",
+ "homepage": "https://awilum.github.io"
}
],
"require": {
- "php": "^7.4 || ^8.0",
- "glowy/arrays": "^4.0"
+ "php": "^8.1",
+ "glowy/arrays": "^5.0"
},
"autoload":{
"psr-4": {
@@ -30,8 +30,18 @@
},
"require-dev": {
"doctrine/coding-standard": "9.0.0",
- "pestphp/pest": "^1.21.1",
- "phpstan/phpstan": "^1.2.0",
- "symfony/var-dumper": "^5.4.0"
+ "pestphp/pest": "^1.21.3",
+ "phpstan/phpstan": "^1.8.0",
+ "victorjonsson/markdowndocs": "dev-master"
+ },
+ "config": {
+ "apcu-autoloader": true,
+ "optimize-autoloader": true,
+ "platform-check": false,
+ "sort-packages": true,
+ "allow-plugins": {
+ "pestphp/pest-plugin": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
}
}
diff --git a/src/Registry.php b/src/Registry.php
index 03a81ae..f6c8042 100644
--- a/src/Registry.php
+++ b/src/Registry.php
@@ -11,12 +11,12 @@ class Registry extends Arrays
/**
* Registry instance
*/
- private static ?Registry $instance = null;
+ private static Registry|null $instance = null;
/**
* Registry storage
*/
- private static ?Arrays $storage = null;
+ private static Arrays|null $storage = null;
/**
* Gets the instance via lazy initialization (created on first usage)
diff --git a/src/helpers.php b/src/helpers.php
index 4db7277..15b8c82 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -2,13 +2,15 @@
declare(strict_types=1);
+namespace Glowy\Registry;
+
use Glowy\Registry\Registry;
if (! function_exists('registry')) {
/**
* Gets the instance via lazy initialization (created on first usage)
*/
- function registry(): Registry
+ function registry(): \Glowy\Registry\Registry
{
return Registry::getInstance();
}
diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php
index ccabef3..78307d2 100644
--- a/tests/RegistryTest.php
+++ b/tests/RegistryTest.php
@@ -3,6 +3,7 @@
declare(strict_types = 1);
use Glowy\Registry\Registry;
+use function Glowy\Registry\registry;
test('test getInstance() method', function() {
$this->assertInstanceOf(Registry::class, Registry::getInstance());