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

[5.1] Joomla Update : extensions check never ends (from #43226) #43410

Merged
merged 92 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
2047969
[5.1]Vote : aggregateRating error in Google Rich Results
conseilgouz Mar 1, 2024
f2f2565
Update rating.php
conseilgouz Mar 1, 2024
2110d3b
[5.1] Add aggregateRating
conseilgouz Mar 3, 2024
6eec765
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 3, 2024
ee326b9
Update libraries/src/Schemaorg/SchemaorgPrepareProductAggregateRating…
conseilgouz Mar 3, 2024
b0ca4a4
Update libraries/src/Schemaorg/SchemaorgPrepareProductAggregateRating…
conseilgouz Mar 3, 2024
d04ab02
Update administrator/language/en-GB/plg_schemaorg_aggregaterating.ini
conseilgouz Mar 3, 2024
18329b8
Update libraries/src/Schemaorg/SchemaorgPrepareRecipeAggregateRating.php
conseilgouz Mar 3, 2024
c89a71a
Update libraries/src/Schemaorg/SchemaorgPrepareRecipeAggregateRating.php
conseilgouz Mar 3, 2024
6a2a3b3
Update plugins/schemaorg/aggregaterating/aggregaterating.xml
conseilgouz Mar 3, 2024
eb87e70
Update plugins/schemaorg/aggregaterating/services/provider.php
conseilgouz Mar 3, 2024
bc4a773
Update plugins/schemaorg/aggregaterating/aggregaterating.xml
conseilgouz Mar 3, 2024
079b53c
Update plugins/schemaorg/aggregaterating/services/provider.php
conseilgouz Mar 3, 2024
f9dad77
Update plugins/schemaorg/aggregaterating/src/Extension/AggregateRatin…
conseilgouz Mar 3, 2024
1c7ae08
Update plugins/schemaorg/aggregaterating/src/Extension/AggregateRatin…
conseilgouz Mar 3, 2024
5906495
Update plugins/schemaorg/aggregaterating/src/Extension/AggregateRatin…
conseilgouz Mar 3, 2024
06361f7
Update plugins/schemaorg/aggregaterating/aggregaterating.xml
conseilgouz Mar 3, 2024
6a2ef72
Update plugins/schemaorg/aggregaterating/src/Extension/AggregateRatin…
conseilgouz Mar 3, 2024
51055ae
Update plugins/schemaorg/aggregaterating/src/Extension/AggregateRatin…
conseilgouz Mar 3, 2024
7bad455
Update plugins/schemaorg/aggregaterating/src/Extension/AggregateRatin…
conseilgouz Mar 3, 2024
c2d6ab7
Update SchemaorgPrepareProductAggregateRating.php
conseilgouz Mar 3, 2024
dcc65f3
Update SchemaorgPrepareRecipeAggregateRating.php
conseilgouz Mar 3, 2024
b007a9c
5.1 : AggregateRating
conseilgouz Mar 3, 2024
ea09697
5.1 : aggregaterating
conseilgouz Mar 3, 2024
ad65284
Update rating.php
conseilgouz Mar 3, 2024
5f84ef9
5.1 aggregateRating
conseilgouz Mar 3, 2024
881b8db
Update Vote.php
conseilgouz Mar 3, 2024
3671034
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 3, 2024
da2242f
5.1 : aggregatrating
conseilgouz Mar 3, 2024
556e59e
Merge branch '5.1-dev' of https://github.com/conseilgouz/joomla-cms i…
conseilgouz Mar 3, 2024
c89fdee
5.1 : aggregaterating
conseilgouz Mar 3, 2024
e4e206b
5.1 : aggregaterating
conseilgouz Mar 3, 2024
250efa5
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 3, 2024
50aa1c5
5.1 : aggregaterating
conseilgouz Mar 3, 2024
73bec50
Merge branch '5.1-dev' of https://github.com/conseilgouz/joomla-cms i…
conseilgouz Mar 3, 2024
e6c7e8a
Update Vote.php
conseilgouz Mar 3, 2024
62c2fdd
5.1 : aggregaterating
conseilgouz Mar 3, 2024
b8ea2bf
Update SchemaorgPrepareRecipeAggregateRating.php
conseilgouz Mar 3, 2024
2e5aa50
Update rating.php
conseilgouz Mar 3, 2024
d5b4970
Update libraries/src/Schemaorg/SchemaorgPrepareProductAggregateRating…
conseilgouz Mar 3, 2024
209236c
Update plugins/content/vote/src/Extension/Vote.php
conseilgouz Mar 3, 2024
ff5cf0d
5.1 : aggregaterating
conseilgouz Mar 3, 2024
393ff14
Merge branch '5.1-dev' of https://github.com/conseilgouz/joomla-cms i…
conseilgouz Mar 3, 2024
ae60130
5.1 : aggregaterating
conseilgouz Mar 4, 2024
70cfee2
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 4, 2024
33a6dea
5.1 : aggregaterating
conseilgouz Mar 4, 2024
78bcf77
Merge branch '5.1-dev' of https://github.com/conseilgouz/joomla-cms i…
conseilgouz Mar 4, 2024
659ddfc
Update Vote.php
conseilgouz Mar 4, 2024
b8bb9f1
5.1 : aggregaterating
conseilgouz Mar 4, 2024
ff2555e
Update Vote.php
conseilgouz Mar 4, 2024
297c185
5.1 : aggregaterating
conseilgouz Mar 4, 2024
c0d0bd8
Update Vote.php
conseilgouz Mar 4, 2024
9af6bce
Update Vote.php
conseilgouz Mar 4, 2024
ba432f6
5.1 aggregaterating
conseilgouz Mar 4, 2024
9ffa36c
5.1 : aggregaterating for Article
conseilgouz Mar 4, 2024
0c286f7
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 4, 2024
514e2cf
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 4, 2024
5cf1222
Update libraries/src/Schemaorg/SchemaorgPrepareAggregateRating.php
conseilgouz Mar 4, 2024
d96cf41
Update plugins/content/vote/src/Extension/Vote.php
conseilgouz Mar 4, 2024
7d252e6
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 4, 2024
ce0ca5d
5.1 : aggregaterating
conseilgouz Mar 4, 2024
61c2ae5
Merge branch '5.1-dev' of https://github.com/conseilgouz/joomla-cms i…
conseilgouz Mar 4, 2024
54855a2
Update Vote.php
conseilgouz Mar 4, 2024
70a3661
No vote
conseilgouz Mar 4, 2024
704d2e5
Update Vote.php
conseilgouz Mar 4, 2024
928f354
Update Vote.php
conseilgouz Mar 4, 2024
8e26131
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 5, 2024
54f871f
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 5, 2024
7bebf3a
Merge branch '5.1-dev' into 5.1-dev
conseilgouz Mar 6, 2024
3bb1ba4
Merge branch 'joomla:5.1-dev' into 5.1-dev
conseilgouz Apr 6, 2024
61a5519
Update Update.php
conseilgouz Apr 6, 2024
c124cb9
Update UpdateModel.php
conseilgouz Apr 6, 2024
eca2730
restore Update.php
conseilgouz Apr 6, 2024
de21fd4
restore UpdateModel.php
conseilgouz Apr 6, 2024
4108b2a
Issue 43196
Apr 7, 2024
2643410
Issue 43196
Apr 7, 2024
4ed2231
Merge branch 'j50_issue_43196' of https://github.com/conseilgouz/joom…
Apr 7, 2024
9c0bc50
Merge branch '5.1-dev' into j50_issue_43196
richard67 Apr 7, 2024
1f26c3b
revert vote.php
Apr 7, 2024
d573cd0
revert rating.php
Apr 7, 2024
750d794
Update Update.php
Apr 7, 2024
4e9740f
rename jversionfull to targetVersion
Apr 8, 2024
1e7e2fc
Update Update.php
Apr 8, 2024
1bd35da
Update Update.php
Apr 8, 2024
3c4d63f
Update Update.php
Apr 8, 2024
ce21fdb
Update Update.php
Apr 8, 2024
c9e209f
Merge branch '5.1-dev' into j50_issue_43196
richard67 Apr 8, 2024
8d02443
Update Update.php
Apr 8, 2024
197a232
Merge branch 'j50_issue_43196' of https://github.com/conseilgouz/joom…
Apr 8, 2024
531f25a
Merge branch '5.1-dev' into j50_issue_43196
conseilgouz May 1, 2024
1e28113
Merge branch '5.1-dev' into j50_issue_43196
bembelimen May 11, 2024
c74cfb5
Merge branch '5.1-dev' into j50_issue_43196
bembelimen May 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1632,7 +1632,7 @@ private function checkCompatibility($updateFileUrl, $joomlaTargetVersion)
$minimumStability = ComponentHelper::getParams('com_installer')->get('minimum_stability', Updater::STABILITY_STABLE);

$update = new Update();
$update->set('jversion.full', $joomlaTargetVersion);
$update->setTargetVersion($joomlaTargetVersion);
$update->loadFromXml($updateFileUrl, $minimumStability);

$compatibleVersions = $update->get('compatibleVersions');
Expand Down
42 changes: 41 additions & 1 deletion libraries/src/Updater/Update.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,21 @@ class Update
protected $stability;
protected $supported_databases;
protected $php_minimum;
protected $folder;
protected $changelogurl;
public $sha256;
public $sha384;
public $sha512;
protected $section;

/**
* Joomla! target version used by the pre-update check
*
* @var string
* @since __DEPLOY_VERSION__
*/
private $targetVersion;

/**
* Gets the reference to the current direct parent
*
Expand Down Expand Up @@ -372,7 +382,7 @@ public function _endElement($parser, $name)
if (
isset($this->currentUpdate->targetplatform->name)
&& $product == $this->currentUpdate->targetplatform->name
&& preg_match('/^' . $this->currentUpdate->targetplatform->version . '/', $this->get('jversion.full', JVERSION))
&& preg_match('/^' . $this->currentUpdate->targetplatform->version . '/', $this->getTargetVersion())
) {
// Collect information on updates which do not meet PHP and DB version requirements
$otherUpdateInfo = new \stdClass();
Expand Down Expand Up @@ -690,4 +700,34 @@ protected function stabilityTagToInteger($tag)

return Updater::STABILITY_STABLE;
}

/**
* Set extension's Joomla! target version
*
* @param string $version The target version
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
public function setTargetVersion($version)
{
$this->targetVersion = $version;
}

/**
* Get extension's Joomla! target version
*
* @return string
*
* @since __DEPLOY_VERSION__
*/
public function getTargetVersion()
{
if (!$this->targetVersion) {
return JVERSION;
}

return $this->targetVersion;
}
}