Skip to content

Update dependencies for PHP 8.1+ compatibility #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update dependencies for PHP 8.1+ compatibility #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d686bcb
Fix "make test" errors
misha-rollun Nov 21, 2024
292cb6a
Update to php8.1
misha-rollun Nov 21, 2024
aeac638
Add php requirement to composer.json
misha-rollun Nov 21, 2024
cf8d526
Fix 'The "/tmp/test/" directory does not exist.' exception in tests
misha-rollun Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
}
],
"require": {
"symfony/filesystem": "^3.4",
"symfony/finder": "^3.4",
"symfony/lock": "^3.4",
"aws/aws-sdk-php": "^2.7"
"php": "^8.1",
"symfony/filesystem": "^6.4",
"symfony/finder": "^6.4",
"symfony/lock": "^6.4",
"aws/aws-sdk-php": "^3.328.3"
},
"require-dev": {
"atoum/atoum": "~3.1",
"satooshi/php-coveralls": "dev-master"
"atoum/atoum": "^4.2",
"php-coveralls/php-coveralls": "^2.7"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion coverage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Do "php path/to/test/file -c path/to/this/file" or "php path/to/atoum/scripts/runner.php -c path/to/this/file -f path/to/test/file" to use it.
*/

use \mageekguy\atoum;
use \atoum\atoum;

// HTML

Expand Down
10 changes: 6 additions & 4 deletions docker/test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
FROM php:7.1
FROM php:8.1

RUN pecl install xdebug
RUN pecl install xdebug-3.3.2
RUN docker-php-ext-enable xdebug
RUN curl -sS https://getcomposer.org/installer | php && \
mv composer.phar /usr/local/bin/composer
RUN apt-get update && apt-get install -y \
git

RUN apt-get update && apt-get install -y git zip

COPY ./ssh/ssh_config /etc/ssh/ssh_config

COPY ./conf.d /usr/local/etc/php/conf.d

WORKDIR /data
1 change: 1 addition & 0 deletions docker/test/conf.d/xdebug.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xdebug.mode=coverage
10 changes: 5 additions & 5 deletions src/Adapter/FileAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Finder\SplFileInfo;
use Symfony\Component\Lock\Factory;
use Symfony\Component\Lock\LockFactory;
use Symfony\Component\Lock\Store\FlockStore;

class FileAdapter extends AbstractAdapter implements AdapterInterface
Expand All @@ -31,7 +31,7 @@ class FileAdapter extends AbstractAdapter implements AdapterInterface
/** @var Filesystem $fs */
private $fs;

/** @var Factory $lockHandlerFactory */
/** @var LockFactory $lockHandlerFactory */
private $lockHandlerFactory;

/** @var PriorityHandlerInterface $priorityHandler */
Expand All @@ -42,12 +42,12 @@ class FileAdapter extends AbstractAdapter implements AdapterInterface
* @param PriorityHandlerInterface $priorityHandler
* @param Filesystem $fs
* @param Finder $finder
* @param Factory $lockHandlerFactory
* @param LockFactory $lockHandlerFactory
*
* @throws \InvalidArgumentException
* @throws QueueAccessException
*/
public function __construct($repository, PriorityHandlerInterface $priorityHandler = null, Filesystem $fs = null, Finder $finder = null, Factory $lockHandlerFactory = null)
public function __construct(string $repository, PriorityHandlerInterface $priorityHandler = null, Filesystem $fs = null, Finder $finder = null, LockFactory $lockHandlerFactory = null)
{
if (empty($repository)) {
throw new \InvalidArgumentException('Argument repository empty or not defined.');
Expand Down Expand Up @@ -76,7 +76,7 @@ public function __construct($repository, PriorityHandlerInterface $priorityHandl
}

if (null === $lockHandlerFactory) {
$lockHandlerFactory = new Factory(new FlockStore($repository));
$lockHandlerFactory = new LockFactory(new FlockStore($repository));
}

$this->priorityHandler = $priorityHandler;
Expand Down
Loading