Skip to content

Commit

Permalink
Update for PHP 8
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicksagona
nicksagona committed Nov 16, 2022
1 parent 7fe876a commit 74e827b
Show file tree
Hide file tree
Showing 22 changed files with 59 additions and 51 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/phpunit.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
php-versions: [ '7.4', '8.0' ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

#- name: Validate composer.json and composer.lock
# run: composer validate
Expand All @@ -25,12 +28,12 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
php-version: ${{ matrix.php-versions }}
extensions: redis

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.TXT
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3 Clause License

Copyright (c) 2009-2021, NOLA Interactive, LLC.
Copyright (c) 2009-2023, NOLA Interactive, LLC.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
12 changes: 6 additions & 6 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
}
],
"require": {
"php": ">=7.3.0",
"popphp/popphp": "^3.7.0",
"popphp/pop-db": "^5.3.0",
"popphp/pop-utils": "^1.2.0",
"opis/closure": "^3.6.0"
"php": ">=7.4.0",
"popphp/popphp": "^3.7.2",
"popphp/pop-db": "^5.3.4",
"popphp/pop-utils": "^1.3.2",
"opis/closure": "^3.6.3"
},
"require-dev": {
"popphp/pop-kettle": "^1.3.0",
"popphp/pop-kettle": "^1.6.2",
"phpunit/phpunit": "^9.0.0"
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/AbstractAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -22,7 +22,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/AdapterInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -22,7 +22,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Db.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -23,7 +23,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Exception.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -19,7 +19,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/File.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -22,7 +22,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Redis.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -22,7 +22,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Exception.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -19,7 +19,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
15 changes: 10 additions & 5 deletions src/Manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -13,13 +13,15 @@
*/
namespace Pop\Queue;

use ReturnTypeWillChange;

/**
* Queue manager class
*
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down Expand Up @@ -164,6 +166,7 @@ public function __unset($name)
* @param mixed $value
* @return Manager
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
return $this->__set($offset, $value);
Expand All @@ -175,6 +178,7 @@ public function offsetSet($offset, $value)
* @param string $offset
* @return Queue
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
return $this->__get($offset);
Expand All @@ -186,7 +190,7 @@ public function offsetGet($offset)
* @param string $offset
* @return boolean
*/
public function offsetExists($offset)
public function offsetExists($offset): bool
{
return $this->__isset($offset);
}
Expand All @@ -197,6 +201,7 @@ public function offsetExists($offset)
* @param string $offset
* @return Manager
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
return $this->__unset($offset);
Expand All @@ -207,7 +212,7 @@ public function offsetUnset($offset)
*
* @return int
*/
public function count()
public function count(): int
{
return count($this->queues);
}
Expand All @@ -217,7 +222,7 @@ public function count()
*
* @return \ArrayIterator
*/
public function getIterator()
public function getIterator(): \ArrayIterator
{
return new \ArrayIterator($this->queues);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/AbstractProcessor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -22,7 +22,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Exception.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -19,7 +19,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Jobs/AbstractJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -23,7 +23,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Jobs/Exception.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -19,7 +19,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Jobs/Job.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -19,7 +19,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Jobs/JobInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -21,7 +21,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Jobs/Schedule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/popphp/popphp-framework
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
*/

Expand All @@ -19,7 +19,7 @@
* @category Pop
* @package Pop\Queue
* @author Nick Sagona, III <[email protected]>
* @copyright Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @copyright Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
* @license http://www.popphp.org/license New BSD License
* @version 1.2.0
*/
Expand Down
Loading

0 comments on commit 74e827b

Please sign in to comment.