php-packages/config
1
Fork 0
Code Issues Pull Requests Actions Releases 1 Activity

Removed php 8.4 deprications

Browse Source
This commit is contained in:
Ron Rise
2025-04-25 20:38:26 -04:00
parent ad88f128b9
commit c56226ca7d
13 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

11
.idea/config.iml generated Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Siteworx\Config\" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Siteworx\Config\Test\" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

6
.idea/inspectionProfiles/Project_Default.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="PhpComposerExtensionStubsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</component>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/config.iml" filepath="$PROJECT_DIR$/.idea/config.iml" />
</modules>
</component>
</project>

17
.idea/php.xml generated Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MessDetectorOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCSFixerOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCodeSnifferOptionsConfiguration">
<option name="highlightLevel" value="WARNING" />
<option name="transferred" value="true" />
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="8.4" />
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>
</project>

7
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

2
composer.json
View File

@@ -17,7 +17,7 @@
} }
], ],
"require": { "require": {
"php": "^8.1" "php": "^8.4"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.5", "phpunit/phpunit": "^9.5",

6
src/Config.php
View File

@@ -80,12 +80,12 @@ class Config extends AbstractConfig
* Loads a Config instance. * Loads a Config instance.
* *
* @param string|array $values Filenames or string with configuration * @param string|array $values Filenames or string with configuration
* @param ParserInterface | null $parser Configuration parser * @param ParserInterface | null $parser Configuration parser
* @throws EmptyDirectoryException * @throws EmptyDirectoryException
* @throws FileNotFoundException * @throws FileNotFoundException
* @throws UnsupportedFormatException * @throws UnsupportedFormatException
*/ */
private function __construct(string | array $values, ParserInterface $parser = null, bool $loadFromString = false) private function __construct(string | array $values, ?ParserInterface $parser = null, bool $loadFromString = false)
{ {
if ($loadFromString && !is_array($values) && !file_exists($values)) { if ($loadFromString && !is_array($values) && !file_exists($values)) {
if ($parser === null) { if ($parser === null) {
@@ -156,7 +156,7 @@ class Config extends AbstractConfig
* @throws Exception\WriteException if the data could not be written to the file * @throws Exception\WriteException if the data could not be written to the file
* @throws UnsupportedFormatException * @throws UnsupportedFormatException
*/ */
public function toFile(string $filename, WriterInterface $writer = null): void public function toFile(string $filename, ?WriterInterface $writer = null): void
{ {
if ($writer === null) { if ($writer === null) {
// Get file information // Get file information

10
src/Exception/WriteException.php
View File

@@ -8,11 +8,11 @@ class WriteException extends ErrorException
{ {
public function __construct(array $error) public function __construct(array $error)
{ {
$message = isset($error['message']) ? $error['message'] : 'There was an error writing the file'; $message = $error['message'] ?? 'There was an error writing the file';
$code = isset($error['code']) ? $error['code'] : 0; $code = $error['code'] ?? 0;
$severity = isset($error['type']) ? $error['type'] : 1; $severity = $error['type'] ?? 1;
$filename = isset($error['file']) ? $error['file'] : __FILE__; $filename = $error['file'] ?? __FILE__;
$exception = isset($error['exception']) ? $error['exception'] : null; $exception = $error['exception'] ?? null;
parent::__construct($message, $code, $severity, $filename, $exception); parent::__construct($message, $code, $severity, $filename, $exception);
} }

6
src/Parser/Json.php
View File

@@ -49,13 +49,13 @@ class Json implements ParserInterface
/** /**
* Completes parsing of JSON data * Completes parsing of JSON data
* *
* @param array | null $data * @param array | null $data
* @param string | null $filename * @param string | null $filename
* @return array | null * @return array | null
* *
* @throws ParseException If there is an error parsing the JSON data * @throws ParseException If there is an error parsing the JSON data
*/ */
protected function parse(array $data = null, string $filename = null): ?array protected function parse(?array $data = null, ?string $filename = null): ?array
{ {
if (json_last_error() !== JSON_ERROR_NONE) { if (json_last_error() !== JSON_ERROR_NONE) {
$error_message = 'Syntax error'; $error_message = 'Syntax error';

4
src/Parser/Php.php
View File

@@ -84,12 +84,12 @@ class Php implements ParserInterface
* Completes parsing of PHP data * Completes parsing of PHP data
* *
* @param array | callable | null $data * @param array | callable | null $data
* @param string | null $filename * @param string | null $filename
* *
* @return array | null * @return array | null
* @throws UnsupportedFormatException * @throws UnsupportedFormatException
*/ */
protected function parse(array | callable $data = null, string $filename = null): ?array protected function parse(array | callable|null $data = null, ?string $filename = null): ?array
{ {
// If we have a callable, run it and expect an array back // If we have a callable, run it and expect an array back
if (is_callable($data)) { if (is_callable($data)) {

6
src/Parser/Serialize.php
View File

@@ -38,13 +38,13 @@ class Serialize implements ParserInterface
/** /**
* Completes parsing of JSON data * Completes parsing of JSON data
* *
* @param string | null $data * @param string | null $data
* @param string | null $filename * @param string | null $filename
* @return array|null * @return array|null
* *
* @throws ParseException If there is an error parsing the serialized data * @throws ParseException If there is an error parsing the serialized data
*/ */
protected function parse(string $data = null, string $filename = null): ?array protected function parse(?string $data = null, ?string $filename = null): ?array
{ {
try { try {
$serializedData = unserialize($data, ['allowed_classes' => false]); $serializedData = unserialize($data, ['allowed_classes' => false]);

6
src/Parser/Xml.php
View File

@@ -20,7 +20,7 @@ class Xml implements ParserInterface
* {@inheritDoc} * {@inheritDoc}
* Parses an XML file as an array * Parses an XML file as an array
* *
* @throws ParseException If there is an error parsing the XML file * @throws ParseException|\JsonException If there is an error parsing the XML file
*/ */
public function parseFile(string $filename): array public function parseFile(string $filename): array
{ {
@@ -52,14 +52,14 @@ class Xml implements ParserInterface
* Completes parsing of XML data * Completes parsing of XML data
* *
* @param \SimpleXMLElement | null $data * @param \SimpleXMLElement | null $data
* @param string | null $filename * @param string | null $filename
* *
* @return array|null * @return array|null
* *
* @throws ParseException If there is an error parsing the XML data * @throws ParseException If there is an error parsing the XML data
* @throws \JsonException * @throws \JsonException
*/ */
protected function parse(\SimpleXMLElement $data = null, string $filename = null): ?array protected function parse(?\SimpleXMLElement $data = null, ?string $filename = null): ?array
{ {
if ($data === false) { if ($data === false) {
$errors = libxml_get_errors(); $errors = libxml_get_errors();