Skip to content
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

[REF][PHP8.2] IDS fixes for dynamic property deprecation #363

Merged
merged 1 commit into from
Jun 10, 2023
Merged

[REF][PHP8.2] IDS fixes for dynamic property deprecation #363

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
4 changes: 2 additions & 2 deletions IDS/Caching/Apc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class IDS_Caching_Apc implements IDS_Caching_Interface
/**
* Cache configuration
*
* @var array
* @var IDS_Init
*/
private $config = null;

Expand All @@ -82,7 +82,7 @@ class IDS_Caching_Apc implements IDS_Caching_Interface
* Constructor
*
* @param string $type caching type
* @param array $init the IDS_Init object
* @param IDS_Init $init the IDS_Init object
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion IDS/Caching/Memcached.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class IDS_Caching_Memcached implements IDS_Caching_Interface
* Constructor
*
* @param string $type caching type
* @param array $init the IDS_Init object
* @param IDS_Init $init the IDS_Init object
*
* @return void
*/
Expand Down
6 changes: 6 additions & 0 deletions IDS/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
*/
class IDS_Filter
{
/**
* Filter ID
*
* @var integer
*/
protected $id;

/**
* Filter rule
Expand Down
9 changes: 8 additions & 1 deletion IDS/Log/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class IDS_Log_Database implements IDS_Log_Interface
/**
* Prepared SQL statement
*
* @var string
* @var PDOStatement
*/
private $statement = null;

Expand All @@ -126,6 +126,13 @@ class IDS_Log_Database implements IDS_Log_Interface
*/
private $ip = 'local/unknown';

/**
* Holds current HTTP_X_FORWARDED_FOR address
*
* @var string
*/
private $ip2 = '';

/**
* Instance container
*
Expand Down
8 changes: 7 additions & 1 deletion IDS/Log/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ class IDS_Log_Email implements IDS_Log_Interface
*/
protected $headers = null;

/**
* Optional envelope string
*
* @var string
*/
protected $envelope = null;

/**
* Safemode switch
*
Expand Down Expand Up @@ -160,7 +167,6 @@ protected function __construct($config)
} elseif (is_array($config)) {
$this->recipients[] = $config['recipients'];
$this->subject = $config['subject'];
$this->additionalHeaders = $config['header'];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

additionalHeaders was not being used anywhere, so rather than declare the property, I removed this line.

}

// determine correct IP address and concat them if necessary
Expand Down
7 changes: 7 additions & 0 deletions IDS/Monitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,13 @@ class IDS_Monitor
*/
private $tmpJsonString = '';

/**
* Centrifuge data
*
* @var array
*/
public $centrifuge = [];


/**
* Constructor
Expand Down