Skip to content

Add explicit type declarations to class constants (PHP 8.3+) #215

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

Add explicit type declarations to class constants (PHP 8.3+) #215

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 phpdotnet/phd/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class Config
{
public const VERSION = '@phd_version@';
public const string VERSION = '@phd_version@';
public readonly string $copyright;

/** @var array<string, string> */
Expand Down
2 changes: 1 addition & 1 deletion phpdotnet/phd/ErrorHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class ErrorHandler
{
private const ERROR_MAP = [
private const array ERROR_MAP = [
// PHP Triggered Errors
E_DEPRECATED => 'E_DEPRECATED ',
E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR ',
Expand Down
4 changes: 2 additions & 2 deletions phpdotnet/phd/Format.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ abstract class Format extends ObjectStorage
* @var integer
* @usedby createLink()
*/
const SDESC = 1;
const int SDESC = 1;

/**
* Represents a long description.
Expand All @@ -19,7 +19,7 @@ abstract class Format extends ObjectStorage
* @var integer
* @usedby createLink()
*/
const LDESC = 2;
const int LDESC = 2;

protected Config $config;
protected OutputHandler $outputHandler;
Expand Down
2 changes: 1 addition & 1 deletion phpdotnet/phd/OutputHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class OutputHandler
{
/** @var array */
private const CONSTANT_TO_MESSAGE_CATEGORY_MAP = [
private const array CONSTANT_TO_MESSAGE_CATEGORY_MAP = [
// PhD informationals
VERBOSE_INDEXING => 'Indexing ',
VERBOSE_FORMAT_RENDERING => 'Rendering Format ',
Expand Down
4 changes: 2 additions & 2 deletions phpdotnet/phd/Package/Generic/Manpage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
namespace phpdotnet\phd;

class Package_Generic_Manpage extends Format_Abstract_Manpage {
const OPEN_CHUNK = 0x01;
const CLOSE_CHUNK = 0x02;
const int OPEN_CHUNK = 0x01;
const int CLOSE_CHUNK = 0x02;

private $elementmap = array( /* {{{ */
'acronym' => 'format_suppressed_tags',
Expand Down
4 changes: 2 additions & 2 deletions phpdotnet/phd/Package/IDE/API.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ class Package_IDE_API
*
* @var string
*/
const FUNCTIONS_DIR = 'ide-xml';
const string FUNCTIONS_DIR = 'ide-xml';

/**
* Output file of the funclist format in the IDE Package.
*
* @var string
*/
const FUNCLIST_FILE = 'ide-funclist.txt';
const string FUNCLIST_FILE = 'ide-funclist.txt';

/**
* PhD output directory.
Expand Down
4 changes: 2 additions & 2 deletions phpdotnet/phd/Package/PEAR/CHM.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
namespace phpdotnet\phd;

class Package_PEAR_CHM extends Package_PEAR_ChunkedXHTML {
const DEFAULT_FONT = "Arial,10,0";
const DEFAULT_TITLE = "PEAR Manual";
const string DEFAULT_FONT = "Arial,10,0";
const string DEFAULT_TITLE = "PEAR Manual";

// Array to manual code -> HTML Help Code conversion
// Code list: http://www.helpware.net/htmlhelp/hh_info.htm
Expand Down
4 changes: 2 additions & 2 deletions phpdotnet/phd/Package/PHP/CHM.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

class Package_PHP_CHM extends Package_PHP_ChunkedXHTML
{
const DEFAULT_FONT = "Arial,10,0";
const DEFAULT_TITLE = "PHP Manual";
const string DEFAULT_FONT = "Arial,10,0";
const string DEFAULT_TITLE = "PHP Manual";

// Array to manual code -> HTML Help Code conversion
// Code list: http://www.helpware.net/htmlhelp/hh_info.htm
Expand Down
2 changes: 1 addition & 1 deletion phpdotnet/phd/Package/PHP/KDevelop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace phpdotnet\phd;

class Package_PHP_KDevelop extends Format {
const DEFAULT_HREF = "http://www.php.net/manual/en/";
const string DEFAULT_HREF = "http://www.php.net/manual/en/";

protected $elementmap = array(
'book' => 'format_tocsect1',
Expand Down
8 changes: 4 additions & 4 deletions phpdotnet/phd/Reader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

class Reader extends \XMLReader
{
const XMLNS_XML = "http://www.w3.org/XML/1998/namespace";
const XMLNS_XLINK = "http://www.w3.org/1999/xlink";
const XMLNS_PHD = "http://www.php.net/ns/phd";
const XMLNS_DOCBOOK = "http://docbook.org/ns/docbook";
const string XMLNS_XML = "http://www.w3.org/XML/1998/namespace";
const string XMLNS_XLINK = "http://www.w3.org/1999/xlink";
const string XMLNS_PHD = "http://www.php.net/ns/phd";
const string XMLNS_DOCBOOK = "http://docbook.org/ns/docbook";

protected OutputHandler $outputHandler;

Expand Down
14 changes: 7 additions & 7 deletions phpdotnet/phd/Render.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

class Render extends ObjectStorage
{
const CHUNK = 0x001;
const OPEN = 0x002;
const CLOSE = 0x004;
const STANDALONE = 0x008;
const INIT = 0x010;
const FINALIZE = 0x020;
const VERBOSE = 0x040;
const int CHUNK = 0x001;
const int OPEN = 0x002;
const int CLOSE = 0x004;
const int STANDALONE = 0x008;
const int INIT = 0x010;
const int FINALIZE = 0x020;
const int VERBOSE = 0x040;

private $STACK = array();

Expand Down