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.

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

Bump friendsofphp/php-cs-fixer from 3.62.0 to 3.64.0 #97

Merged
merged 2 commits into from
Sep 1, 2024
Merged
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
72 changes: 36 additions & 36 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static function getComponentVersion()
*/
public static function getCurrentVersion($package)
{
switch($package['type']) {
switch ($package['type']) {
case 'component':
$file = JPATH_ADMINISTRATOR.'/components/'.$package['name'].'/com_magebridge.xml';
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function display($tpl = null)
$layoutType = $this->app->input->getCmd('type');

// Determine the layout and data
switch($layoutType) {
switch ($layoutType) {
case 'product':
$this->doProductLayout();
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ protected function _getNextToken()
case ':':
$this->_token = self::COLON;
break;
case '"':
case '"':
$result = '';
do {
$i++;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function getApiDetails()
foreach ($rows as $row) {
$key = $row['scope'].'-'.$row['scope_id'];
if (!isset($details[$key])) {
switch($row['scope']) {
switch ($row['scope']) {
case 'websites':
$scope_name = Mage::app()->getWebsite($row['scope_id'])->getName().' ['.$row['scope'].']';
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function saveUserMap($data)

try {
$map->save();
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->trace('Failed to save map', $e->getMessage());
}

Expand Down
4 changes: 2 additions & 2 deletions magento/app/code/community/Yireo/MageBridge/Model/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function getResult($resourcePath, $arguments = null)

try {
$apiModel = Mage::getModel($apiClass);
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to instantiate API-class '.$apiClass.': '.$e->getMessage());
return false;
}
Expand All @@ -71,7 +71,7 @@ public function getResult($resourcePath, $arguments = null)
Mage::getSingleton('magebridge/debug')->notice('API class "'.$apiClass.'" has no method '.$apiMethod);
return false;
}
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to call API: '.$resourcePath.': '.$e->getMessage());
return false;
}
Expand Down
10 changes: 5 additions & 5 deletions magento/app/code/community/Yireo/MageBridge/Model/Block.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function init()
if (Mage::getSingleton('magebridge/core')->getMetaData('app') == 1) {
$controller->getAction()->getLayout()->getUpdate()->addHandle('magebridge_backend');
}
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to load controller: '.$e->getMessage());
return false;
}
Expand Down Expand Up @@ -72,7 +72,7 @@ public function getBlock($block_name = '')
try {
$block = $controller->getAction()->getLayout()->getBlock($block_name);
$instances[$block_name] = $block;
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to get block: '.$block_name.': '.$e->getMessage());
return false;
}
Expand Down Expand Up @@ -114,7 +114,7 @@ public function getBlockByType($block_name = '', $block_type = '')
try {
$block = $controller->getAction()->getLayout()->createBlock($block_type);
$instances[$block_name] = $block;
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to get block: type '.$block_type.': '.$e->getMessage());
}

Expand Down Expand Up @@ -236,7 +236,7 @@ public function getBlockOutput($block_name, $arguments = [])
// Get the HTML of the block-object
try {
return $block->toHtml();
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to get html from block '.$block_name.': '.$e->getMessage());
}

Expand Down Expand Up @@ -296,7 +296,7 @@ public function filter($html = '')
if (!empty($processor)) {
try {
$new_html = $processor->filter($html);
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Template filter failed: '.$e->getMessage());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ public static function getBreadcrumbs()
try {
$controller = Mage::getSingleton('magebridge/core')->getController();
$controller->getResponse()->clearBody();
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to load controller: '.$e->getMessage());
return false;
}

try {
$block = $controller->getAction()->getLayout()->getBlock('breadcrumbs');
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to get breadcrumbs: '.$e->getMessage());
return false;
}
Expand All @@ -62,7 +62,7 @@ public static function getBreadcrumbs()

return $crumbs;
}
} catch(Exception $e) {
} catch (Exception $e) {
Mage::getSingleton('magebridge/debug')->error('Failed to set block: '.$e->getMessage());
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function items($arguments = null)

// Set ordering
if (isset($arguments['ordering'])) {
switch($arguments['ordering']) {
switch ($arguments['ordering']) {
case 'newest':
$collection->setOrder('created_at', 'desc');
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function Yireo_MageBridge_ErrorHandler($errno, $errstr, $errfile, $errline)
$close_bridge = false;

// Handle each error-type differently
switch($errno) {
switch ($errno) {
// With errors, we need to close the bridge and exit
case E_ERROR:
case E_USER_ERROR:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ protected function applyOrdering(&$collection)
}

// Set ordering
switch($this->arguments['ordering']) {
switch ($this->arguments['ordering']) {
case 'newest':
$collection->setOrder('created_at', 'desc');
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function authenticate($username, $password)
$rt = false;
try {
$rt = parent::authenticate($username, $password);
} catch(Exception $e) {
} catch (Exception $e) {
$rt = false;
}

Expand Down
Loading