Skip to content

Commit 9363e78

Browse files
authored
[4.4] replace deprecated joomla/string inflector (#40317)
* [4.4] replace deprecated joomla/string inflector * add system tests * cs
1 parent 9e16aae commit 9363e78

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

libraries/src/MVC/Controller/FormController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace Joomla\CMS\MVC\Controller;
1111

12+
use Doctrine\Inflector\InflectorFactory;
1213
use Joomla\CMS\Application\CMSApplication;
1314
use Joomla\CMS\Component\ComponentHelper;
1415
use Joomla\CMS\Form\FormFactoryAwareInterface;
@@ -133,7 +134,7 @@ public function __construct(
133134

134135
// Guess the list view as the plural of the item view.
135136
if (empty($this->view_list)) {
136-
$this->view_list = \Joomla\String\Inflector::getInstance()->toPlural($this->view_item);
137+
$this->view_list = InflectorFactory::create()->build()->pluralize($this->view_item);
137138
}
138139

139140
$this->setFormFactory($formFactory);

libraries/src/MVC/View/ListView.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace Joomla\CMS\MVC\View;
1111

12+
use Doctrine\Inflector\InflectorFactory;
1213
use Joomla\CMS\Factory;
1314
use Joomla\CMS\Language\Text;
1415
use Joomla\CMS\Layout\FileLayout;
@@ -209,7 +210,7 @@ protected function addToolbar()
209210
$bar = Toolbar::getInstance('toolbar');
210211

211212
$viewName = $this->getName();
212-
$singularViewName = \Joomla\String\Inflector::getInstance()->toSingular($viewName);
213+
$singularViewName = InflectorFactory::create()->build()->singularize($viewName);
213214

214215
ToolbarHelper::title(Text::_($this->toolbarTitle), $this->toolbarIcon);
215216

tests/System/integration/administrator/components/com_categories/Category.cy.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,12 @@ describe('Test in backend that the category form', () => {
1010
cy.get('#system-message-container').contains('Category saved.').should('exist');
1111
cy.contains('Test category');
1212
});
13+
14+
it('check redirection to list view', () => {
15+
cy.visit('administrator/index.php?option=com_categories&task=category.add&extension=com_content');
16+
cy.intercept('index.php?option=com_categories&view=categories&extension=com_content').as('listview');
17+
cy.clickToolbarButton('Cancel');
18+
19+
cy.wait('@listview');
20+
});
1321
});

tests/System/integration/administrator/components/com_content/Article.cy.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,12 @@ describe('Test in backend that the article form', () => {
2020
cy.get('td').contains('Special').should('exist');
2121
});
2222
});
23+
24+
it('check redirection to list view', () => {
25+
cy.visit('administrator/index.php?option=com_content&task=article.add');
26+
cy.intercept('index.php?option=com_content&view=articles').as('listview');
27+
cy.clickToolbarButton('Cancel');
28+
29+
cy.wait('@listview');
30+
});
2331
});

0 commit comments

Comments
 (0)