Skip to content

php 8.4 compatibility #52

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
Xon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

php 8.4 compatibility #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion InstallAndUpgrade/AbstractHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ abstract class AbstractHandler implements ArrayAccess
* AbstractHandler constructor.
* @param Profile|null $profile
*/
public function __construct(Profile $profile = null)
public function __construct(?Profile $profile = null)
{
$this->app = XF::app();
$this->em = $this->app->em();
Expand Down
2 changes: 1 addition & 1 deletion Repository/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Log extends Repository
* @param User|null $user
* @throws PrintableException
*/
public function log(Product $product, $action, $extra = [], User $user = null)
public function log(Product $product, $action, $extra = [], ?User $user = null)
{
if (!$user) {
$user = XF::visitor();
Expand Down
4 changes: 2 additions & 2 deletions Service/StyleArchive/Extractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function open()
* @param array $failures
* @return bool
*/
public function checkWritable(array $changeset = null, &$failures = [])
public function checkWritable(?array $changeset = null, &$failures = [])
{
$zip = $this->zip();
$failures = [];
Expand Down Expand Up @@ -153,7 +153,7 @@ protected function getFinalFsFileName($fileName)
* @return array
* @noinspection PhpUnusedParameterInspection
*/
public function copyFiles(array $changeset = null, $start = 0, Timer $timer = null)
public function copyFiles(?array $changeset = null, $start = 0, ?Timer $timer = null)
{
$zip = $this->zip();
$lastComplete = $start;
Expand Down
6 changes: 3 additions & 3 deletions Service/StyleArchive/Installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Installer extends AbstractService
* @param Product $product
* @param Style|null $parentStyle
*/
public function __construct(App $app, $file, Product $product, Style $parentStyle = null)
public function __construct(App $app, $file, Product $product, ?Style $parentStyle = null)
{
parent::__construct($app);

Expand All @@ -60,7 +60,7 @@ public function __construct(App $app, $file, Product $product, Style $parentStyl
* @return array
* @throws PrintableException
*/
public function install(array $xmls, Style $parent = null, array $childXmls = [], $force = false)
public function install(array $xmls, ?Style $parent = null, array $childXmls = [], $force = false)
{
$response = null;

Expand All @@ -83,7 +83,7 @@ public function install(array $xmls, Style $parent = null, array $childXmls = []
* @return array
* @throws PrintableException
*/
protected function installStyle($xml, Style $parent = null, $childXmls = [], $force = false)
protected function installStyle($xml, ?Style $parent = null, $childXmls = [], $force = false)
{
/** @var Import $styleImporter */
$styleImporter = $this->service('XF:Style\Import');
Expand Down
4 changes: 4 additions & 0 deletions addon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
"XFRM": "https://xenforo.com/community/resources/install-and-upgrade.6753/"
},
"require": {
"php": [
"7.1.0",
"PHP 7.1.0+"
],
"XF": [
2010010,
"XenForo 2.1.0+"
Expand Down