Skip to content

Commit

Permalink
TASK: Adjust to removed package freezing API's
Browse files Browse the repository at this point in the history 
Neos part for neos/flow-development-collection#3446

See flows refactoring in 8.4: neos/flow-development-collection#3443
  • Loading branch information
@mhsdesign
mhsdesign committed Feb 13, 2025
1 parent 811c679 commit c749174
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 60 deletions.
5 changes: 1 addition & 4 deletions Neos.ContentRepositoryRegistry/Classes/Package.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ public function boot(Bootstrap $bootstrap)
$nodeTypeConfigurationFileMonitor = FileMonitor::createFileMonitorAtBoot('ContentRepository_NodeTypesConfiguration', $bootstrap);
/** @var PackageManager $packageManager */
$packageManager = $bootstrap->getEarlyInstance(PackageManager::class);
foreach ($packageManager->getFlowPackages() as $packageKey => $package) {
if ($packageManager->isPackageFrozen($packageKey)) {
continue;
}
foreach ($packageManager->getFlowPackages() as $package) {
if (file_exists($package->getConfigurationPath())) {
$nodeTypeConfigurationFileMonitor->monitorDirectory($package->getConfigurationPath(), 'NodeTypes(\..+)\.yaml');
}
Expand Down
6 changes: 1 addition & 5 deletions Neos.Fusion/Classes/Package.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ public function boot(Bootstrap $bootstrap)
$fusionFileMonitor = FileMonitor::createFileMonitorAtBoot('Fusion_Files', $bootstrap);
/** @var PackageManager $packageManager */
$packageManager = $bootstrap->getEarlyInstance(PackageManager::class);
foreach ($packageManager->getFlowPackages() as $packageKey => $package) {
if ($packageManager->isPackageFrozen($packageKey)) {
continue;
}

foreach ($packageManager->getFlowPackages() as $package) {
$fusionPaths = [
$package->getResourcesPath() . 'Private/Fusion',
$package->getPackagePath() . 'NodeTypes'
Expand Down
1 change: 0 additions & 1 deletion Neos.Neos/Classes/Controller/Module/Administration/PackagesController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public function indexAction()
'name' => $package->getComposerManifest('name'),
'type' => $package->getComposerManifest('type'),
'description' => $package->getComposerManifest('description'),
'isFrozen' => $this->packageManager->isPackageFrozen($package->getPackageKey())
];
}
ksort($packageGroups);
Expand Down
2 changes: 0 additions & 2 deletions Neos.Neos/Resources/Private/Templates/Module/Administration/Packages/Index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<th>{neos:backend.translate(id: 'version', package: 'Neos.Neos')}</th>
<th>{neos:backend.translate(id: 'packages.key', source: 'Modules', package: 'Neos.Neos')}</th>
<th>{neos:backend.translate(id: 'packages.type', source: 'Modules', package: 'Neos.Neos')}</th>
<th class="neos-aCenter neos-span1">Frozen</th>
</thead>
<tbody>
<f:for each="{packageGroups}" key="packageGroup" as="packages">
Expand Down Expand Up @@ -47,7 +46,6 @@
<span class="neos-label">{package.type}</span>
</label>
</td>
<td class="neos-priority1 neos-aCenter"><i class="fas fa-{f:if(condition: package.isFrozen, then: 'check', else: 'times')}"></i></td>
</tr>
</f:for>
</f:for>
Expand Down
48 changes: 0 additions & 48 deletions Neos.Neos/Resources/Private/Translations/en/Modules.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,54 +262,6 @@
<trans-unit id="packages.deactivated" xml:space="preserve">
<source>Deactivated</source>
</trans-unit>
<trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
<source>This package is currently frozen. Click to unfreeze it.</source>
</trans-unit>
<trans-unit id="packages.tooltip.freeze" xml:space="preserve">
<source>Freeze the package in order to speed up your website.</source>
</trans-unit>
<trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
<source>This package is protected and cannot be deactivated.</source>
</trans-unit>
<trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
<source>Deactivate Package</source>
</trans-unit>
<trans-unit id="packages.tooltip.activate" xml:space="preserve">
<source>Activate Package</source>
</trans-unit>
<trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
<source>This package is protected and cannot be deleted.</source>
</trans-unit>
<trans-unit id="packages.tooltip.delete" xml:space="preserve">
<source>Delete Package</source>
</trans-unit>
<trans-unit id="packages.message.reallyDelete" xml:space="preserve">
<source>Do you really want to delete "{0}"?</source>
</trans-unit>
<trans-unit id="packages.message.confirmDelete" xml:space="preserve">
<source>Yes, delete the package</source>
</trans-unit>
<trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
<source>Yes, delete the packages</source>
</trans-unit>
<trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
<source>Do you really want to delete the selected packages?</source>
</trans-unit>
<trans-unit id="packages.selected.freeze" xml:space="preserve">
<source>Freeze selected packages</source>
</trans-unit>
<trans-unit id="packages.selected.unfreeze" xml:space="preserve">
<source>Unfreeze selected packages</source>
</trans-unit>
<trans-unit id="packages.selected.delete" xml:space="preserve">
<source>Delete selected packages</source>
</trans-unit>
<trans-unit id="packages.selected.deactivate" xml:space="preserve">
<source>Deactivate selected packages</source>
</trans-unit>
<trans-unit id="packages.selected.activate" xml:space="preserve">
<source>Activate selected packages</source>
</trans-unit>

<trans-unit id="sites.label" xml:space="preserve">
<source>Sites Management</source>
Expand Down

0 comments on commit c749174

Please sign in to comment.