[6.1] Remove ExecRuleHelper #36439

ditsuke · 2021-12-27T15:09:40Z

Summary of Changes

Replace the ExecRuleHelper class with Task::computeNextExecution().

Testing Instructions

Creating new tasks and modifying existing tasks works as expected.
Triggered tasks computer next execution date as expected from configuration.

Actual result BEFORE applying this Pull Request

ExecRuleHelper exists, for little reason.

Expected result AFTER applying this Pull Request

ExecRuleHelper is safely replaced by Task::computeNextExecution()

Documentation Changes Required

-

- Task::computeNextExecution() replaces ExecRuleHelper::nextExec(). - Replaces ExecRuleHelper() usages.

ExecRuleHelper is made redundant with the addition of Task::computeNextExecution(). Given all its usages have been replaced, this commit safely removes the class.

chmst · 2021-12-31T11:52:05Z

I applied this patch and tried to change settings of a task:

When saving this settings:

PHP 8.0, win11 and xampp

richard67 · 2021-12-31T12:40:57Z

The removed helper PHP will have to be added to the list of files to be deleted on update in script.php. I will do that when this PR has been merged.

richard67 · 2021-12-31T12:52:21Z

@ditsuke I think @chmst indeed found an issue with your changed code, possibly here: https://github.com/joomla/joomla-cms/pull/36439/files#diff-b9f75ae33fad36d7a8968d12a2b78ec972c5e6d2c6fd7ed0024d764191ec48ecR572 .

Possibly a type cast to object is not sufficient. I don't have looked up now what the constructor expects.

Fixes issue identified with creating/saving tasks. Since Task objects are also now created by TaskModel::save(), the parameter resolution in the constructor must accommodate for records from both the database and form submissions (both cast to object). This commit adds the necessary check, so we can deal with both possible types.

…exec-rule-helper'

ditsuke · 2022-01-01T06:08:27Z

@chmst @richard67 thanks for identifying the issue and the source! The latest commit should solve it. Please test.

chmst · 2022-01-01T09:22:18Z

You fixed the code error, but I don't understand why the Task Params are twice. First in tab "New Task" and in tab "Advanced"?

ditsuke · 2022-01-01T10:03:10Z

You fixed the code error, but I don't understand why the Task Params are twice. First in tab "New Task" and in tab "Advanced"?

@chmst I addressed that in #36515 (needs test). We need the routine parameter fieldset to have a showFront="true" attribute at the moment. Although I don't think that's ideal, this PR should work for now. Let's try to work on removing this requirement in the future!

…exec-rule-helper'

ditsuke · 2022-01-15T19:30:08Z

Could we please get a couple tests on this 😃

…lper Conflicts: administrator/components/com_scheduler/src/Task/Task.php

HLeithner · 2022-06-27T13:06:47Z

This pull request has automatically rebased to 4.2-dev.

chmst · 2022-10-22T10:29:40Z

@ditsuke this PR is still open. could you please resolve the conflicts so that we can re-test?

HLeithner · 2023-05-02T16:42:56Z

This pull request has been automatically rebased to 5.0-dev.

HLeithner · 2023-09-30T22:52:19Z

This pull request has been automatically rebased to 5.1-dev.

HLeithner · 2024-04-24T09:09:59Z

This pull request has been automatically rebased to 5.2-dev.

cybersalt · 2024-08-21T19:35:09Z

I have tested this item 🔴 unsuccessfully on 4f91c6a

I opened an existing task, changed a setting, saved and closed and got a 500 error:

An error has occurred.
0 Class "Joomla\Component\Scheduler\Administrator\Model\ExecRuleHelper" not found
Call Stack

Function Location

1 () JROOT/administrator/components/com_scheduler/src/Model/TaskModel.php:571
2 Joomla\Component\Scheduler\Administrator\Model\TaskModel->save() JROOT/libraries/src/MVC/Controller/FormController.php:689
3 Joomla\CMS\MVC\Controller\FormController->save() JROOT/libraries/src/MVC/Controller/BaseController.php:730
4 Joomla\CMS\MVC\Controller\BaseController->execute() JROOT/libraries/src/Dispatcher/ComponentDispatcher.php:143
5 Joomla\CMS\Dispatcher\ComponentDispatcher->dispatch() JROOT/libraries/src/Component/ComponentHelper.php:361
6 Joomla\CMS\Component\ComponentHelper::renderComponent() JROOT/libraries/src/Application/AdministratorApplication.php:150
7 Joomla\CMS\Application\AdministratorApplication->dispatch() JROOT/libraries/src/Application/AdministratorApplication.php:195
8 Joomla\CMS\Application\AdministratorApplication->doExecute() JROOT/libraries/src/Application/CMSApplication.php:306
9 Joomla\CMS\Application\CMSApplication->execute() JROOT/administrator/includes/app.php:58
10 require_once() JROOT/administrator/index.php:32

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36439.}

ghost · 2024-09-02T07:55:45Z

@cybersalt same as this comment

HLeithner · 2024-09-02T08:54:12Z

This pull request has been automatically rebased to 5.3-dev.

HLeithner · 2025-03-04T17:23:26Z

This pull request has been automatically rebased to 6.0-dev.

# Conflicts: # administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php # administrator/components/com_scheduler/src/Model/TaskModel.php # administrator/components/com_scheduler/src/Task/Task.php

QuyTon · 2025-03-31T20:15:58Z

administrator/components/com_scheduler/src/Task/Task.php

+     *
+     * @return ?Date|string  Next due execution.
+     *
+     * @since  4.1.0


Suggested change

* @since 4.1.0

* @since __DEPLOY_VERSION__

HLeithner · 2025-08-31T12:01:20Z

This pull request has been automatically rebased to 6.1-dev.

ditsuke added 2 commits December 27, 2021 20:35

Add ExecRuleHelper replacement to Task driver

f14fe27

- Task::computeNextExecution() replaces ExecRuleHelper::nextExec(). - Replaces ExecRuleHelper() usages.

Remove ExecRuleHelper

a656bff

ExecRuleHelper is made redundant with the addition of Task::computeNextExecution(). Given all its usages have been replaced, this commit safely removes the class.

joomla-cms-bot added the PR-4.1-dev label Dec 27, 2021

Fix code-style

38141a9

ditsuke added 2 commits January 1, 2022 11:35

Merge branch '4.1-dev' of github.com:joomla/joomla-cms into 'replace-…

74d427c

…exec-rule-helper'

bembelimen and others added 3 commits January 1, 2022 22:48

Merge branch '4.1-dev' into replace-exec-rule-helper

73cc995

Merge branch '4.1-dev' of github.com:joomla/joomla-cms into 'replace-…

c064696

…exec-rule-helper'

Merge branch '4.1-dev' into replace-exec-rule-helper

0dd6f30

Merge remote-tracking branch 'jcms/4.1-dev' into replace-exec-rule-he…

4f91c6a

…lper Conflicts: administrator/components/com_scheduler/src/Task/Task.php

HLeithner changed the base branch from 4.1-dev to 4.2-dev June 27, 2022 13:06

rdeutz added PR-4.2-dev and removed PR-4.1-dev labels Aug 1, 2022

chmst added the Conflicting Files label Oct 22, 2022

Hackwar added the Feature label Apr 6, 2023

HLeithner changed the base branch from 4.2-dev to 5.0-dev May 2, 2023 16:42

alikon added PR-5.0-dev and removed PR-4.2-dev labels May 22, 2023

HLeithner changed the base branch from 5.0-dev to 5.1-dev September 30, 2023 22:52

HLeithner changed the base branch from 5.1-dev to 5.2-dev April 24, 2024 09:09

HLeithner changed the title ~~[4.1] Remove ExecRuleHelper~~ [5.2] Remove ExecRuleHelper Apr 24, 2024

joomla-cms-bot added the PR-5.2-dev label Apr 24, 2024

HLeithner changed the base branch from 5.2-dev to 5.3-dev September 2, 2024 08:54

HLeithner changed the title ~~[5.2] Remove ExecRuleHelper~~ [5.3] Remove ExecRuleHelper Sep 2, 2024

joomla-cms-bot added the PR-5.3-dev label Sep 2, 2024

Hackwar removed the PR-5.2-dev label Sep 3, 2024

Hackwar removed the PR-5.0-dev label Sep 25, 2024

HLeithner changed the base branch from 5.3-dev to 6.0-dev March 4, 2025 17:23

HLeithner changed the title ~~[5.3] Remove ExecRuleHelper~~ [6.0] Remove ExecRuleHelper Mar 4, 2025

joomla-cms-bot added the PR-6.0-dev label Mar 4, 2025

rdeutz removed the PR-5.3-dev label Mar 5, 2025

MacJoom marked this pull request as draft March 31, 2025 19:01

Hackwar added 3 commits March 31, 2025 21:21

Merge branch '6.0-dev' into replace-exec-rule-helper

6a77b25

# Conflicts: # administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php # administrator/components/com_scheduler/src/Model/TaskModel.php # administrator/components/com_scheduler/src/Task/Task.php

Codestyle

5d964cd

Codestyle

505b700

Hackwar removed the Conflicting Files label Mar 31, 2025

QuyTon reviewed Mar 31, 2025

View reviewed changes

MacJoom marked this pull request as ready for review April 1, 2025 09:08

HLeithner changed the base branch from 6.0-dev to 6.1-dev August 31, 2025 12:01

HLeithner changed the title ~~[6.0] Remove ExecRuleHelper~~ [6.1] Remove ExecRuleHelper Aug 31, 2025

joomla-cms-bot added the PR-6.1-dev label Aug 31, 2025

Uh oh!

[6.1] Remove ExecRuleHelper #36439

Are you sure you want to change the base?

[6.1] Remove ExecRuleHelper #36439

Uh oh!

Conversation

ditsuke commented Dec 27, 2021

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

Uh oh!

chmst commented Dec 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

richard67 commented Dec 31, 2021

Uh oh!

richard67 commented Dec 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ditsuke commented Jan 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chmst commented Jan 1, 2022

Uh oh!

ditsuke commented Jan 1, 2022

Uh oh!

ditsuke commented Jan 15, 2022

Uh oh!

HLeithner commented Jun 27, 2022

Uh oh!

chmst commented Oct 22, 2022

Uh oh!

HLeithner commented May 2, 2023

Uh oh!

HLeithner commented Sep 30, 2023

Uh oh!

HLeithner commented Apr 24, 2024

Uh oh!

cybersalt commented Aug 21, 2024

Function Location

Uh oh!

ghost commented Sep 2, 2024

Uh oh!

HLeithner commented Sep 2, 2024

Uh oh!

HLeithner commented Mar 4, 2025

Uh oh!

QuyTon Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

HLeithner commented Aug 31, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

chmst commented Dec 31, 2021 •

edited

Loading

richard67 commented Dec 31, 2021 •

edited

Loading

ditsuke commented Jan 1, 2022 •

edited

Loading