Skip to content

Commit

Permalink
Compatibility with PHP 8
Browse files Browse the repository at this point in the history
  • Loading branch information
steevanb committed Nov 29, 2021
1 parent e06abbe commit e292afc
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
vendor/
.idea/
/vendor/
7 changes: 6 additions & 1 deletion OverloadClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,12 @@ protected static function getPhpForDuplicatedFile($filePath, $fullyQualifiedClas
$isGlobalUse = false;
} elseif ($token[0] === T_EXTENDS) {
static::addUse(static::getClassNameFromTokens($tokens, $index + 1), $namespaceFound, $uses, $addUses);
} elseif ($isGlobalUse && $token[0] === T_USE) {
} elseif (
$isGlobalUse
&& $token[0] === T_USE
// remove "use function foo" syntax
&& $tokens[$index + 2][0] === T_STRING
) {
$uses[] = static::getClassNameFromTokens($tokens, $index + 1);
$lastUseLine = $token[2];
}
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[![version](https://img.shields.io/badge/version-1.3.3-green.svg)](https://github.com/steevanb/composer-overload-class/tree/1.3.3)
[![composer](https://img.shields.io/badge/composer-^1.0-blue.svg)](https://getcomposer.org)
[![version](https://img.shields.io/badge/version-1.4.0-green.svg)](https://github.com/steevanb/composer-overload-class/tree/1.4.0)
[![composer](https://img.shields.io/badge/composer-^1.0||^2.0-blue.svg)](https://getcomposer.org)
![Lines](https://img.shields.io/badge/code%20lines-508-green.svg)
![Total Downloads](https://poser.pugx.org/steevanb/composer-overload-class/downloads)
[![Scrutinizer](https://scrutinizer-ci.com/g/steevanb/composer-overload-class/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/steevanb/composer-overload-class/)

composer-overload-class
-----------------------
Expand All @@ -27,7 +26,7 @@ Installation
------------

```bash
composer require steevanb/composer-overload-class ^1.3
composer require steevanb/composer-overload-class ^1.4
```

Configuration
Expand Down
15 changes: 13 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,24 @@
"name": "steevanb/composer-overload-class",
"license": "MIT",
"description": "Add extra to composer.json, to overload autoloaded class",
"minimum-stability": "dev",
"autoload": {
"psr-4": {
"steevanb\\ComposerOverloadClass\\": ""
}
},
"require": {
"php": "^5.4.0 || ^7.0"
"php": "^5.4.0 || ^7.0 || ^8.0"
},
"require-dev": {
"composer/composer": "2.1.*"
},
"scripts": {
"rm-composer-lock": "rm composer.lock",
"post-install-cmd": [
"@rm-composer-lock"
],
"post-update-cmd": [
"@rm-composer-lock"
]
}
}

0 comments on commit e292afc

Please sign in to comment.