Skip to content

rector: IssetOnPropertyObjectToPropertyExistsRector #4881

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.

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
CodeQuality\If_\SimplifyIfElseToTernaryRector::class,
CodeQuality\If_\SimplifyIfReturnBoolRector::class,
CodeQuality\Include_\AbsolutizeRequireAndIncludePathRector::class, # todo: TMP
CodeQuality\Isset_\IssetOnPropertyObjectToPropertyExistsRector::class, # todo: TMP
CodeQuality\Ternary\SwitchNegatedTernaryRector::class, # todo: TMP
CodeQuality\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector::class, # todo: TMP
CodeQuality\Ternary\UnnecessaryTernaryExpressionRector::class, # todo: TMP
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

/**
Expand Down Expand Up @@ -33,7 +33,7 @@
$this->setFilterVisibility(false);
$this->setPagerVisibility(false);
$this->setUseAjax(false);
if (isset($this->_columnGroupBy)) {
if ($this->_columnGroupBy !== null) {
$this->isColumnGrouped($this->_columnGroupBy, true);
}
$this->setEmptyCellLabel(Mage::helper('adminhtml')->__('No records found for this period.'));
Expand Down
8 changes: 4 additions & 4 deletions app/code/core/Mage/Adminhtml/Block/System/Config/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public function initFields($fieldset, $group, $section, $fieldPrefix = '', $labe
foreach ($element->depends->children() as $dependent) {
/** @var Mage_Core_Model_Config_Element $dependent */

if (isset($dependent->fieldset)) {
if ($dependent->fieldset !== null) {
$dependentFieldGroupName = (string) $dependent->fieldset;
if (!isset($this->_fieldsets[$dependentFieldGroupName])) {
$dependentFieldGroupName = $group->getName();
Expand Down Expand Up @@ -387,13 +387,13 @@ public function initFields($fieldset, $group, $section, $fieldPrefix = '', $labe
]);
$this->_prepareFieldOriginalData($field, $element);

if (isset($element->validate)) {
if ($element->validate !== null) {
$field->addClass($element->validate);
}

if (isset($element->frontend_type)
if ($element->frontend_type !== null
&& (string) $element->frontend_type === 'multiselect'
&& isset($element->can_be_empty)
&& $element->can_be_empty !== null
) {
$field->setCanBeEmpty(true);
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Adminhtml/Helper/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ public function getBackendModelByInputType(string $inputType): ?string
*/
public function getBackendModelByFieldConfig(Varien_Simplexml_Element $fieldConfig): ?string
{
if (isset($fieldConfig->backend_model)) {
if ($fieldConfig->backend_model !== null) {
return (string) $fieldConfig->backend_model;
}
if (isset($fieldConfig->frontend_type)) {
if ($fieldConfig->frontend_type !== null) {
return $this->getBackendModelByInputType((string) $fieldConfig->frontend_type);
}
return null;
Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/Adminhtml/Model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,30 +153,30 @@ public function hasChildren($node, $websiteCode = null, $storeCode = null, $isFi
{
$showTab = false;
if ($storeCode) {
if (isset($node->show_in_store)) {
if ($node->show_in_store !== null) {
if ((int) $node->show_in_store) {
$showTab = true;
}
}
} elseif ($websiteCode) {
if (isset($node->show_in_website)) {
if ($node->show_in_website !== null) {
if ((int) $node->show_in_website) {
$showTab = true;
}
}
} elseif (isset($node->show_in_default)) {
} elseif ($node->show_in_default !== null) {
if ((int) $node->show_in_default) {
$showTab = true;
}
}
if ($showTab) {
if (isset($node->groups)) {
if ($node->groups !== null) {
foreach ($node->groups->children() as $children) {
if ($this->hasChildren($children, $websiteCode, $storeCode)) {
return true;
}
}
} elseif (isset($node->fields)) {
} elseif ($node->fields !== null) {
foreach ($node->fields->children() as $children) {
if ($this->hasChildren($children, $websiteCode, $storeCode, true)) {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function _beforeSave()
$config = $this->getFieldConfig();

$validate = [];
if (isset($config->validate)) {
if ($config->validate !== null) {
$validate = array_map('trim', explode(' ', $config->validate));
}

Expand All @@ -33,7 +33,7 @@ protected function _beforeSave()
}

$withHash = true;
if (isset($config->with_hash)) {
if ($config->with_hash !== null) {
$withHash = $config->is('with_hash', true);
}

Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Api/Model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function getAdapters()
$adapters = [];
foreach ($this->getNode('adapters')->children() as $adapterName => $adapter) {
/** @var Varien_Simplexml_Element $adapter */
if (isset($adapter->use)) {
if ($adapter->use !== null) {
$adapter = $this->getNode('adapters/' . (string) $adapter->use);
}
$adapters[$adapterName] = $adapter;
Expand Down Expand Up @@ -215,7 +215,7 @@ public function getFaults($resourceName = null)
{
if (is_null($resourceName)
|| !isset($this->getResources()->$resourceName)
|| !isset($this->getResources()->$resourceName->faults)
|| (!property_exists($this->getResources()->$resourceName, 'faults') || $this->getResources()->$resourceName->faults === null)
) {
$faultsNode = $this->getNode('faults');
} else {
Expand Down
22 changes: 11 additions & 11 deletions app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ public function call($sessionId, $apiPath, $args = [])
return;
}

if (!isset($resources->$resourceName->public)
&& isset($resources->$resourceName->acl)
if ((!property_exists($resources->$resourceName, 'public') || $resources->$resourceName->public === null)
&& (property_exists($resources->$resourceName, 'acl') && $resources->$resourceName->acl !== null)
&& !$this->_isAllowed((string) $resources->$resourceName->acl)
) {
$this->_fault('access_denied');
Expand All @@ -276,7 +276,7 @@ public function call($sessionId, $apiPath, $args = [])
$methodInfo = $resources->$resourceName->methods->$methodName;
$method = (isset($methodInfo->method) ? (string) $methodInfo->method : $methodName);

if (!isset($resources->$resourceName->model)) {
if (!property_exists($resources->$resourceName, 'model') || $resources->$resourceName->model === null) {
throw new Mage_Api_Exception('resource_path_not_callable');
}

Expand Down Expand Up @@ -374,8 +374,8 @@ public function multiCall($sessionId, array $calls = [], $options = [])
}
}

if (!isset($resources->$resourceName->public)
&& isset($resources->$resourceName->acl)
if ((!property_exists($resources->$resourceName, 'public') || $resources->$resourceName->public === null)
&& (property_exists($resources->$resourceName, 'acl') && $resources->$resourceName->acl !== null)
&& !$this->_isAllowed((string) $resources->$resourceName->acl)
) {
$result[] = $this->_faultAsArray('access_denied');
Expand All @@ -401,7 +401,7 @@ public function multiCall($sessionId, array $calls = [], $options = [])
$methodInfo = $resources->$resourceName->methods->$methodName;
$method = (isset($methodInfo->method) ? (string) $methodInfo->method : $methodName);

if (!isset($resources->$resourceName->model)) {
if (!property_exists($resources->$resourceName, 'model') || $resources->$resourceName->model === null) {
throw new Mage_Api_Exception('resource_path_not_callable');
}

Expand Down Expand Up @@ -471,13 +471,13 @@ public function resources($sessionId)
}

foreach ($this->_getConfig()->getResources() as $resourceName => $resource) {
if (isset($resource->acl) && !$this->_isAllowed((string) $resource->acl)) {
if (property_exists($resource, 'acl') && $resource->acl !== null && !$this->_isAllowed((string) $resource->acl)) {
continue;
}

$methods = [];
foreach ($resource->methods->children() as $methodName => $method) {
if (isset($method->acl) && !$this->_isAllowed((string) $method->acl)) {
if (property_exists($method, 'acl') && $method->acl !== null && !$this->_isAllowed((string) $method->acl)) {
continue;
}
$methodAliases = [];
Expand All @@ -489,7 +489,7 @@ public function resources($sessionId)

$methods[] = [
'title' => (string) $method->title,
'description' => (isset($method->description) ? (string) $method->description : null),
'description' => (property_exists($method, 'description') && $method->description !== null ? (string) $method->description : null),
'path' => $resourceName . '.' . $methodName,
'name' => $methodName,
'aliases' => $methodAliases,
Expand All @@ -502,7 +502,7 @@ public function resources($sessionId)

$resources[] = [
'title' => (string) $resource->title,
'description' => (isset($resource->description) ? (string) $resource->description : null),
'description' => (property_exists($resource, 'description') && $resource->description !== null ? (string) $resource->description : null),
'name' => $resourceName,
'aliases' => $resourcesAlias[$resourceName] ?? [],
'methods' => $methods,
Expand Down Expand Up @@ -543,7 +543,7 @@ public function resourceFaults($sessionId, $resourceName)
return;
}

if (isset($resources->$resourceName->acl)
if (property_exists($resources->$resourceName, 'acl') && $resources->$resourceName->acl !== null
&& !$this->_isAllowed((string) $resources->$resourceName->acl)
) {
$this->_fault('access_denied');
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ protected function _addPrivileges(&$item, Varien_Simplexml_Element $node, $name)
{
$roleConfigNodeName = $this->getRole()->getConfigNodeName();
$possibleList = [];
if (isset($node->privileges)) {
if ($node->privileges !== null) {
$possibleRoles = $node->privileges->asArray();
if (isset($possibleRoles[$roleConfigNodeName])) {
$possibleList = $possibleRoles[$roleConfigNodeName];
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Catalog/Helper/Product/Flat.php
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public function disableFlatCollection($save = false)
*/
public function resetFlatCollection()
{
if (isset($this->_forceFlatStatusOld)) {
if ($this->_forceFlatStatusOld !== null) {
$this->_forceFlatStatus = $this->_forceFlatStatusOld;
} else {
$this->_forceFlatStatus = false;
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/CatalogSearch/Helper/Data.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

/**
Expand Down Expand Up @@ -105,7 +105,7 @@
*/
public function getQueryText()
{
if (!isset($this->_queryText)) {
if ($this->_queryText === null) {
$this->_queryText = $this->_getRequest()->getParam($this->getQueryParamName());
if ($this->_queryText === null) {
$this->_queryText = '';
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Checkout/Model/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function setCustomer($customer)
*/
public function hasQuote()
{
return isset($this->_quote);
return $this->_quote !== null;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Controller/Varien/Front.php
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public function rewrite()

$pathInfo = preg_replace($from, $to, $request->getPathInfo());

if (isset($rewrite->complete)) {
if ($rewrite->complete !== null) {
$request->setPathInfo($pathInfo);
} else {
$request->rewritePathInfo($pathInfo);
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ public function getModuleSetup($module = '')
if (is_string($module)) {
$module = $this->getModuleConfig($module);
}
if (isset($module->setup)) {
if ($module->setup !== null) {
$moduleClassName = $module->setup->getClassName();
if (!empty($moduleClassName)) {
$className = $moduleClassName;
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Layout.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function generateXml()
if ($acl && Mage::getSingleton('admin/session')->isAllowed($acl)) {
continue;
}
if (!isset($block->attributes()->ignore)) {
if (!property_exists($block->attributes(), 'ignore') || $block->attributes()->ignore === null) {
$block->addAttribute('ignore', '1');
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Resource.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public function getEntity($model, $entity)
* In MMDB release resource nodes <..._mysql4> were renamed to <..._resource>. So <deprecatedNode> is left
* to keep name of previously used nodes, that still may be used by non-updated extensions.
*/
if (isset($modelsNode->$model->deprecatedNode)) {
if ($modelsNode->$model->deprecatedNode !== null) {
$deprecatedNode = $modelsNode->$model->deprecatedNode;
if (isset($modelsNode->$deprecatedNode->entities->$entity)) {
$entityConfig = $modelsNode->$deprecatedNode->entities->$entity;
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Core/Model/Resource/Setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public static function applyAllUpdates()
continue;
}
$className = self::class;
if (isset($resource->setup->class)) {
if ($resource->setup->class !== null) {
$className = $resource->setup->getClassName();
}
/** @var Mage_Core_Model_Resource_Setup $setupClass */
Expand Down Expand Up @@ -243,7 +243,7 @@ public static function applyAllDataUpdates()
continue;
}
$className = self::class;
if (isset($resource->setup->class)) {
if ($resource->setup->class !== null) {
$className = $resource->setup->getClassName();
}
/** @var Mage_Core_Model_Resource_Setup $setupClass */
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ protected function _rewriteConfig()
$to = $this->_processRewriteUrl($to);

$pathInfo = preg_replace($from, $to, $this->_request->getPathInfo());
if (isset($rewrite->complete)) {
if ($rewrite->complete !== null) {
$this->_request->setPathInfo($pathInfo);
} else {
$this->_request->rewritePathInfo($pathInfo);
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Cron/Model/Observer.php
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ protected function _processAlwaysTask($jobCode, $jobConfig)
return;
}

$cronExpr = isset($jobConfig->schedule->cron_expr) ? (string) $jobConfig->schedule->cron_expr : '';
$cronExpr = property_exists($jobConfig->schedule, 'cron_expr') && $jobConfig->schedule->cron_expr !== null ? (string) $jobConfig->schedule->cron_expr : '';
if ($cronExpr != 'always') {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Customer/Model/Customer.php
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ public function importFromTextArray(array $row)
*/
public function unsetSubscription()
{
if (isset($this->_isSubscribed)) {
if (property_exists($this, '_isSubscribed') && $this->_isSubscribed !== null) {
unset($this->_isSubscribed);
}
return $this;
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Eav/Model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function setCurrentStoreId($storeId)
*/
protected function _storeId()
{
if (isset($this->_currentStoreId) && $this->_currentStoreId !== false) {
if ($this->_currentStoreId !== null && $this->_currentStoreId !== false) {
return $this->_currentStoreId;
}
return Mage::app()->getStore()->getId();
Expand Down Expand Up @@ -399,7 +399,7 @@ public function getEntityType($code, $field = null)
}

// initialize entity type cache
if (!isset($this->_entityTypes)) {
if ($this->_entityTypes === null) {
$this->_initializeStore();
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public function load()
try {
$collection = $this->_getCollectionForLoad($entityType);

if (isset($this->_joinAttr) && is_array($this->_joinAttr)) {
if ($this->_joinAttr !== null && is_array($this->_joinAttr)) {
foreach ($this->_joinAttr as $val) {
$collection->joinAttribute(
$val['alias'],
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Install/Model/Installer/Db.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ protected function _getCheckedData($data)
*/
protected function _getDbResource($model)
{
if (!isset($this->_dbResource)) {
if ($this->_dbResource === null) {
/** @var Mage_Install_Model_Installer_Db_Abstract $resource */
$resource = Mage::getSingleton(sprintf('install/installer_db_%s', $model));
if (!$resource) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

/**
Expand Down Expand Up @@ -102,7 +102,7 @@
*/
protected function _getConnection()
{
if (!isset($this->_connection)) {
if ($this->_connection === null) {
$resource = Mage::getSingleton('core/resource');
$connection = $resource->createConnection('install', $this->getType(), $this->getConnectionData());
$this->_connection = $connection;
Expand Down
12 changes: 6 additions & 6 deletions app/code/core/Mage/Paygate/Model/Authorizenet.php
Original file line number Diff line number Diff line change
Expand Up @@ -1614,12 +1614,12 @@ protected function _parseTransactionDetailsXmlResponseToVarienObject(Varien_Simp
->setTransactionStatus((string) $responseTransactionXmlDocument->transactionStatus)
;
//some additional fields:
isset($responseTransactionXmlDocument->responseReasonDescription) && $response->setResponseReasonDescription((string) $responseTransactionXmlDocument->responseReasonDescription);
isset($responseTransactionXmlDocument->FDSFilterAction) && $response->setFdsFilterAction((string) $responseTransactionXmlDocument->FDSFilterAction);
isset($responseTransactionXmlDocument->FDSFilters) && $response->setFdsFilters(serialize($responseTransactionXmlDocument->FDSFilters->asArray()));
isset($responseTransactionXmlDocument->transactionType) && $response->setTransactionType((string) $responseTransactionXmlDocument->transactionType);
isset($responseTransactionXmlDocument->submitTimeUTC) && $response->setSubmitTimeUtc((string) $responseTransactionXmlDocument->submitTimeUTC);
isset($responseTransactionXmlDocument->submitTimeLocal) && $response->setSubmitTimeLocal((string) $responseTransactionXmlDocument->submitTimeLocal);
$responseTransactionXmlDocument->responseReasonDescription !== null && $response->setResponseReasonDescription((string) $responseTransactionXmlDocument->responseReasonDescription);
$responseTransactionXmlDocument->FDSFilterAction !== null && $response->setFdsFilterAction((string) $responseTransactionXmlDocument->FDSFilterAction);
$responseTransactionXmlDocument->FDSFilters !== null && $response->setFdsFilters(serialize($responseTransactionXmlDocument->FDSFilters->asArray()));
$responseTransactionXmlDocument->transactionType !== null && $response->setTransactionType((string) $responseTransactionXmlDocument->transactionType);
$responseTransactionXmlDocument->submitTimeUTC !== null && $response->setSubmitTimeUtc((string) $responseTransactionXmlDocument->submitTimeUTC);
$responseTransactionXmlDocument->submitTimeLocal !== null && $response->setSubmitTimeLocal((string) $responseTransactionXmlDocument->submitTimeLocal);

return $response;
}
Expand Down
Loading
Loading