new php-cs-fixer

.php_cs.dist

@@ -1,19 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-  ->exclude('ext/amazon_s3/lib')
-  ->exclude('vendor')
-  ->exclude('data')
-  ->in(__DIR__)
-;
-
-return PhpCsFixer\Config::create()
-  ->setRules([
-      '@PSR2' => true,
-      //'strict_param' => true,
-      'array_syntax' => ['syntax' => 'short'],
-  ])
-  ->setFinder($finder)
-;
-
-?>

composer.json

@@ -53,7 +53,7 @@
 
 	"require-dev" : {
 		"phpunit/phpunit" : "^9.0",
-		"friendsofphp/php-cs-fixer" : "^2.18"
+		"friendsofphp/php-cs-fixer" : "^3.4"
 	},
 	"suggest": {
 		"ext-memcache": "memcache caching",

core/basepage.php

@@ -1,13 +1,15 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 require_once "core/event.php";
 
 abstract class PageMode
 {
-    const REDIRECT = 'redirect';
-    const DATA = 'data';
-    const PAGE = 'page';
-    const FILE = 'file';
-    const MANUAL = 'manual';
+    public const REDIRECT = 'redirect';
+    public const DATA = 'data';
+    public const PAGE = 'page';
+    public const FILE = 'file';
+    public const MANUAL = 'manual';
 }
 
 /**

core/basethemelet.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * Class BaseThemelet
@@ -7,7 +9,6 @@
  */
 class BaseThemelet
 {
-
     /**
      * Generic error message display
      */
@@ -124,7 +125,7 @@ class BaseThemelet
         $at_end = ($current_page >= $total_pages);
 
         $first_html  = $at_start ? "First" : $this->gen_page_link($base_url, $query, 1, "First");
-        $prev_html   = $at_start ? "Prev"  : $this->gen_page_link($base_url, $query, $prev, "Prev");
+        $prev_html   = $at_start ? "Prev" : $this->gen_page_link($base_url, $query, $prev, "Prev");
 
         $random_html = "-";
         if ($show_random) {
@@ -132,8 +133,8 @@ class BaseThemelet
             $random_html =                   $this->gen_page_link($base_url, $query, $rand, "Random");
         }
 
-        $next_html   = $at_end   ? "Next"  : $this->gen_page_link($base_url, $query, $next, "Next");
-        $last_html   = $at_end   ? "Last"  : $this->gen_page_link($base_url, $query, $total_pages, "Last");
+        $next_html   = $at_end ? "Next" : $this->gen_page_link($base_url, $query, $next, "Next");
+        $last_html   = $at_end ? "Last" : $this->gen_page_link($base_url, $query, $total_pages, "Last");
 
         $start = $current_page-5 > 1 ? $current_page-5 : 1;
         $end = $start+10 < $total_pages ? $start+10 : $total_pages;

core/block.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * Class Block

core/cacheengine.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 interface CacheEngine
 {
     public function get(string $key);
@@ -27,7 +29,7 @@ class MemcachedCache implements CacheEngine
     public function __construct(string $args)
     {
         $hp = explode(":", $args);
-        $this->memcache = new Memcached;
+        $this->memcache = new Memcached();
         #$this->memcache->setOption(Memcached::OPT_COMPRESSION, False);
         #$this->memcache->setOption(Memcached::OPT_SERIALIZER, Memcached::SERIALIZER_PHP);
         #$this->memcache->setOption(Memcached::OPT_PREFIX_KEY, phpversion());

core/captcha.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * CAPTCHA abstraction                                                       *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

core/command_builder.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 // Provides mechanisms for cleanly executing command-line applications
 // Was created to try to centralize a solution for whatever caused this:

core/config.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * Interface Config

core/database.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 use FFSPHP\PDO;
 
 abstract class DatabaseDriver

core/dbengine.php

@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 abstract class SCORE
 {
-    const AIPK      = "SCORE_AIPK";
-    const INET      = "SCORE_INET";
+    public const AIPK      = "SCORE_AIPK";
+    public const INET      = "SCORE_INET";
 }
 
 abstract class DBEngine

core/event.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * Generic parent class for all events.
  *

core/exceptions.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * A base exception to be caught by the upper levels.

core/extension.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * Class Extension
  *

core/imageboard/event.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * An image is being added to the database.

core/imageboard/image.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * Class Image
  *

core/imageboard/misc.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Misc functions                                                            *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -110,7 +112,7 @@ function get_thumbnail_size(int $orig_width, int $orig_height, bool $use_dpi_sca
     }
 }
 
-function get_scaled_by_aspect_ratio(int $original_width, int $original_height, int $max_width, int $max_height) : array
+function get_scaled_by_aspect_ratio(int $original_width, int $original_height, int $max_width, int $max_height): array
 {
     $xscale = ($max_width/ $original_width);
     $yscale = ($max_height/ $original_height);

core/imageboard/search.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class Querylet
 {
     public string $sql;

core/imageboard/tag.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * Class Tag
  *

core/install.php

@@ -109,8 +109,8 @@ function ask_questions()
 		";
     }
 
-    $db_m = in_array(DatabaseDriver::MYSQL, $drivers)  ? '<option value="'. DatabaseDriver::MYSQL .'">MySQL</option>' : "";
-    $db_p = in_array(DatabaseDriver::PGSQL, $drivers)  ? '<option value="'. DatabaseDriver::PGSQL .'">PostgreSQL</option>' : "";
+    $db_m = in_array(DatabaseDriver::MYSQL, $drivers) ? '<option value="'. DatabaseDriver::MYSQL .'">MySQL</option>' : "";
+    $db_p = in_array(DatabaseDriver::PGSQL, $drivers) ? '<option value="'. DatabaseDriver::PGSQL .'">PostgreSQL</option>' : "";
     $db_s = in_array(DatabaseDriver::SQLITE, $drivers) ? '<option value="'. DatabaseDriver::SQLITE .'">SQLite</option>' : "";
 
     $warn_msg = $warnings ? "<h3>Warnings</h3>".implode("\n<p>", $warnings) : "";

core/logging.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Logging convenience                                                       *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

core/permissions.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 // action_object_attribute
 // action = create / view / edit / delete

core/polyfills.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Things which should be in the core API                                    *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -334,7 +336,7 @@ function unparse_url(array $parsed_url): string
     $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
     $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
     $user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
-    $pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass']  : '';
+    $pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : '';
     $pass     = ($user || $pass) ? "$pass@" : '';
     $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
     $query    = !empty($parsed_url['query']) ? '?' . $parsed_url['query'] : '';

core/sanitize_php.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /*
  * A small number of PHP-sanity things (eg don't silently ignore errors) to
  * be included right at the very start of index.php and tests/bootstrap.php

core/send_event.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Event API                                                                 *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

core/sys_config.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * For any values that aren't defined in data/config/*.php,
  * Shimmie will set the values to their defaults

core/tests/basepage.test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 

core/tests/block.test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 

core/tests/init.test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 

core/tests/polyfills.test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 

core/tests/tag.test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 

core/tests/urls.test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 

core/tests/util.test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 

core/urls.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class Link
 {

core/user.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 function _new_user(array $row): User
 {

core/userclass.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * @global UserClass[] $_shm_user_classes
  */

core/util.php

@@ -1,4 +1,7 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
+use MicroHTML\HTMLElement;
 use function MicroHTML\emptyHTML;
 use function MicroHTML\rawHTML;
 use function MicroHTML\FORM;
@@ -12,7 +15,6 @@ use function MicroHTML\TFOOT;
 use function MicroHTML\TR;
 use function MicroHTML\TH;
 use function MicroHTML\TD;
-use MicroHTML\HTMLElement;
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Misc                                                                      *
@@ -659,7 +661,7 @@ function _get_user(): User
 
 function _get_query(): string
 {
-    return (@$_POST["q"]?:@$_GET["q"])?:"/";
+    return (@$_POST["q"] ?: @$_GET["q"]) ?: "/";
 }
 
 

ext/admin/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AdminPageInfo extends ExtensionInfo
 {

ext/admin/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * Sent when the admin page is ready to be added to

ext/admin/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class AdminPageTest extends ShimmiePHPUnitTestCase
 {
     public function testAuth()

ext/admin/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AdminPageTheme extends Themelet
 {

ext/alias_editor/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AliasEditorInfo extends ExtensionInfo
 {

ext/alias_editor/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use MicroCRUD\ActionColumn;
 use MicroCRUD\TextColumn;

ext/alias_editor/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class AliasEditorTest extends ShimmiePHPUnitTestCase
 {
     public function testAliasList()

ext/alias_editor/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AliasEditorTheme extends Themelet
 {

ext/approval/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class ApprovalInfo extends ExtensionInfo
 {

ext/approval/main.php

@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 abstract class ApprovalConfig
 {
-    const VERSION = "ext_approval_version";
-    const IMAGES = "approve_images";
-    const COMMENTS = "approve_comments";
+    public const VERSION = "ext_approval_version";
+    public const IMAGES = "approve_images";
+    public const COMMENTS = "approve_comments";
 }
 
 class Approval extends Extension
@@ -118,7 +120,7 @@ class Approval extends Extension
     }
 
 
-    const SEARCH_REGEXP = "/^approved:(yes|no)/";
+    public const SEARCH_REGEXP = "/^approved:(yes|no)/";
     public function onSearchTermParse(SearchTermParseEvent $event)
     {
         global $user, $config;

ext/approval/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 use function MicroHTML\BR;
 use function MicroHTML\BUTTON;
 use function MicroHTML\INPUT;

ext/artists/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class ArtistsInfo extends ExtensionInfo
 {

ext/artists/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AuthorSetEvent extends Event
 {

ext/artists/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class ArtistsTest extends ShimmiePHPUnitTestCase
 {
     public function testSearch()

ext/artists/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class ArtistsTheme extends Themelet
 {
     public function get_author_editor_html(string $author): string

ext/auto_tagger/config.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 abstract class AutoTaggerConfig
 {

ext/auto_tagger/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AutoTaggerInfo extends ExtensionInfo
 {

ext/auto_tagger/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 require_once 'config.php';
 

ext/auto_tagger/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class AutoTaggerTest extends ShimmiePHPUnitTestCase
 {
     public function testAutoTaggerList()

ext/auto_tagger/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AutoTaggerTheme extends Themelet
 {

ext/autocomplete/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AutoCompleteInfo extends ExtensionInfo
 {

ext/autocomplete/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AutoComplete extends Extension
 {

ext/autocomplete/test.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 class AutoCompleteTest extends ShimmiePHPUnitTestCase

ext/autocomplete/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class AutoCompleteTheme extends Themelet
 {

ext/ban_words/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BanWordsInfo extends ExtensionInfo
 {

ext/ban_words/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BanWords extends Extension
 {

ext/ban_words/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class BanWordsTest extends ShimmiePHPUnitTestCase
 {
     public function check_blocked($image_id, $words)

ext/bbcode/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BBCodeInfo extends ExtensionInfo
 {

ext/bbcode/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 
 class BBCode extends FormatterExtension

ext/bbcode/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class BBCodeTest extends ShimmiePHPUnitTestCase
 {
     public function testBasics()

ext/biography/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BiographyInfo extends ExtensionInfo
 {

ext/biography/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class Biography extends Extension
 {

ext/biography/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class BiographyTest extends ShimmiePHPUnitTestCase
 {
     public function testBio()

ext/biography/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 use function MicroHTML\TEXTAREA;
 
 class BiographyTheme extends Themelet

ext/blocks/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BlocksInfo extends ExtensionInfo
 {

ext/blocks/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class Blocks extends Extension
 {

ext/blocks/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class BlocksTest extends ShimmiePHPUnitTestCase
 {
     public function testBlocks()

ext/blocks/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 use function MicroHTML\TABLE;
 use function MicroHTML\TR;
 use function MicroHTML\TH;

ext/blotter/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BlotterInfo extends ExtensionInfo
 {

ext/blotter/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class Blotter extends Extension
 {

ext/blotter/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class BlotterTest extends ShimmiePHPUnitTestCase
 {
     public function testDenial()

ext/blotter/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class BlotterTheme extends Themelet
 {
     public function display_editor($entries)

ext/browser_search/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BrowserSearchInfo extends ExtensionInfo
 {

ext/browser_search/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BrowserSearch extends Extension
 {

ext/browser_search/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 class BrowserSearchTest extends ShimmiePHPUnitTestCase
 {
     public function testBasic()

ext/bulk_actions/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkActionsInfo extends ExtensionInfo
 {

ext/bulk_actions/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkActionException extends SCoreException
 {

ext/bulk_actions/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkActionsTheme extends Themelet
 {

ext/bulk_add/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkAddInfo extends ExtensionInfo
 {

ext/bulk_add/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkAddEvent extends Event
 {

ext/bulk_add/test.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkAddTest extends ShimmiePHPUnitTestCase
 {

ext/bulk_add/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkAddTheme extends Themelet
 {

ext/bulk_add_csv/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkAddCSVInfo extends ExtensionInfo
 {

ext/bulk_add_csv/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkAddCSV extends Extension
 {

ext/bulk_add_csv/theme.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkAddCSVTheme extends Themelet
 {

ext/bulk_download/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 
 class BulkDownloadInfo extends ExtensionInfo

ext/bulk_download/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkDownloadConfig
 {
@@ -45,7 +47,7 @@ class BulkDownload extends Extension
             ($event->action == BulkDownload::DOWNLOAD_ACTION_NAME)) {
             $download_filename = $user->name . '-' . date('YmdHis') . '.zip';
             $zip_filename = tempnam(sys_get_temp_dir(), "shimmie_bulk_download");
-            $zip = new ZipArchive;
+            $zip = new ZipArchive();
             $size_total = 0;
             $max_size = $config->get_int(BulkDownloadConfig::SIZE_LIMIT);
 

ext/bulk_import_export/events.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class BulkExportEvent extends Event
 {

ext/bulk_import_export/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 include_once "events.php";
 

ext/bulk_import_export/main.php

@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 
 class BulkImportExport extends DataHandlerExtension
 {
-    const EXPORT_ACTION_NAME = "bulk_export";
-    const EXPORT_INFO_FILE_NAME = "export.json";
+    public const EXPORT_ACTION_NAME = "bulk_export";
+    public const EXPORT_INFO_FILE_NAME = "export.json";
     protected array $SUPPORTED_MIME = [MimeType::ZIP];
 
 
@@ -14,7 +16,7 @@ class BulkImportExport extends DataHandlerExtension
 
         if ($this->supported_mime($event->mime) &&
             $user->can(Permissions::BULK_IMPORT)) {
-            $zip = new ZipArchive;
+            $zip = new ZipArchive();
 
             if ($zip->open($event->tmpname) === true) {
                 $json_data = $this->get_export_data($zip);
@@ -115,7 +117,7 @@ class BulkImportExport extends DataHandlerExtension
             ($event->action == self::EXPORT_ACTION_NAME)) {
             $download_filename = $user->name . '-' . date('YmdHis') . '.zip';
             $zip_filename = tempnam(sys_get_temp_dir(), "shimmie_bulk_export");
-            $zip = new ZipArchive;
+            $zip = new ZipArchive();
 
             $json_data = [];
 

ext/comment/info.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 class CommentListInfo extends ExtensionInfo
 {

ext/comment/main.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 require_once "vendor/ifixit/php-akismet/akismet.class.php";