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

Updated instances of count() that would cause a warning in 7.2 #1443

Closed
wants to merge 11 commits into from
Closed

Updated instances of count() that would cause a warning in 7.2 #1443

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d03272d
Fixed empty sender check due to warning in PHP 7.3
Aug 12, 2019
48a92ec
Merge branch '2019.03'
Aug 12, 2019
c13e9f8
Fixed counting non-countable variables
Aug 12, 2019
5f3cecc
Removed uncessary check for customMatch
Aug 13, 2019
1826600
Updated count() check
Aug 13, 2019
ff08ba1
Fixed emailtransport object check
Aug 13, 2019
16beb9a
Updated logic and styling
Aug 13, 2019
76498bd
Removed debug die()
Aug 13, 2019
a96e6c8
Fixed wrong variable name
Oct 23, 2019
085bbd5
Fixed invalid var
Oct 23, 2019
edb254d
Updated count check to use symfony polyfill
Oct 24, 2019
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
Prev Previous commit
Updated count check to use symfony polyfill
  • Loading branch information
Ruben Bratsberg committed Oct 24, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit edb254d4cda223c667f91871714146189e5aa732
2 changes: 1 addition & 1 deletion kernel/classes/ezcontentobjecttreenode.php
View file
Original file line number Diff line number Diff line change
@@ -4168,7 +4168,7 @@ function subtreeSoleNodeCount( $params = array() )

$nodePath = null;
$nodeDepth = 0;
if (((is_array($node) || $node instanceof Countable) && count($node) != 0) || $node != null) {
if ( is_countable( $node ) && count( $node ) != 0 ) {
$nodePath = $node->attribute( 'path_string' );
$nodeDepth = $node->attribute( 'depth' );
}
8 changes: 1 addition & 7 deletions kernel/common/ezobjectforwarder.php
View file
Original file line number Diff line number Diff line change
@@ -321,13 +321,7 @@ function resourceAcquisitionTransformation( $functionName, &$node, $rule, $input
$matchCount = 0;
foreach ( $matchItem['custom_match'] as $customMatch )
{
$matchConditionCount = 0;

if ($customMatch['conditions'] instanceof Countable || is_array($customMatch['conditions'])) {
$matchConditionCount = count($customMatch['conditions']);
} else if ($customMatch['conditions'] != null) {
$matchConditionCount = 1;
}
$matchConditionCount = is_countable( $customMatch['conditions'] ) ? count( $customMatch['conditions'] ) : 0;
$code = '';
if ( $matchCount > 0 )
{
7 changes: 1 addition & 6 deletions kernel/common/eztemplatedesignresource.php
View file
Original file line number Diff line number Diff line change
@@ -86,12 +86,7 @@ function templateNodeTransformation( $functionName, &$node,
$matchCount = 0;
foreach ( $customMatchList as $customMatch )
{
$matchConditionCount = 0;
if ($customMatch['conditions'] instanceof Countable || is_array($customMatch['conditions'])) {
$matchConditionCount = count($customMatch['conditions']);
} else if ($customMatch['conditions'] != null) {
$matchConditionCount = 1;
}
$matchConditionCount = is_countable( $customMatch['conditions'] ) ? count( $customMatch['conditions'] ) : 0;
$code = '';
if ( $matchCount > 0 )
{
2 changes: 1 addition & 1 deletion lib/ezutils/classes/ezsendmailtransport.php
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ function sendMail( eZMail $mail )
$sendmailOptions = '';
$emailFrom = $mail->sender();
$emailSender = isset( $emailFrom['email'] ) ? $emailFrom['email'] : false;
if ( !$emailSender || ( is_array($emailSender) || $emailSender instanceof Countable && count($emailSender) <= 0) || $emailSender == null )
if ( !$emailSender || ( is_countable( $emailSender ) && count( $emailSender) <= 0 ) )
$emailSender = $ini->variable( 'MailSettings', 'EmailSender' );
if ( !$emailSender )
$emailSender = $ini->variable( 'MailSettings', 'AdminEmail' );