Skip to content

Commit 790665e

Browse files
theboxertheboxer
committed
Updates
1 parent e5ba170 commit 790665e

23 files changed

+182
-545
lines changed

Diff for: ‎core/components/collections/docs/changelog.txt renamed to ‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Changelog for Collections.
22

3+
Collections 4.0.0
4+
===================
5+
- Support for MODX Revolution 3.0.0
6+
37
Collections 3.7.1
48
===================
59
- Fix lexicon typo

Diff for: ‎core/components/collections/docs/license.txt renamed to ‎LICENSE.md

File renamed without changes.

Diff for: ‎_build/gpm.json

+16-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"namespace": "Collections",
55
"description": "Hides resources under this container in tree. Adding grid int o the update resource panel.",
66
"author": "John Peca",
7-
"version": "3.7.2-pl",
7+
"version": "4.0.0-alpha1",
88
"menus": [
99
{
1010
"text": "collections.menu.collection_templates",
@@ -64,13 +64,13 @@
6464
"key": "mgr_tree_icon_collectioncontainer",
6565
"area": "manager",
6666
"value": "collectioncontainer",
67-
"namespace": ""
67+
"namespace": "core"
6868
},
6969
{
7070
"key": "mgr_tree_icon_selectioncontainer",
7171
"area": "manager",
7272
"value": "selectioncontainer",
73-
"namespace": ""
73+
"namespace": "core"
7474
},
7575
{
7676
"key": "renderer_image_path",
@@ -100,18 +100,19 @@
100100
]
101101
},
102102
"build": {
103-
"scripts": {
104-
"before": [
105-
"resolve.customevents.php",
106-
"resolve.switchback.php"
107-
],
108-
"after": [
109-
"resolve.synctables.php",
110-
"resolve.updatefromfirst.php",
111-
"resolve.defaulttemplate.php",
112-
"resolve.fixselections.php",
113-
"resolve.fixsystemsettings.php"
114-
]
103+
"scriptsBefore": [
104+
"resolve.customevents.php",
105+
"resolve.switchback.php"
106+
],
107+
"scriptsAfter": [
108+
"resolve.updatefromfirst.php",
109+
"resolve.defaulttemplate.php",
110+
"resolve.fixselections.php",
111+
"resolve.fixsystemsettings.php"
112+
],
113+
"requires": {
114+
"gpm": ">=3.0.0",
115+
"modx": ">=3.0.0-alpha"
115116
}
116117
}
117118
}

Diff for: ‎_build/gpm_resolvers/gpm.resolve.bootstrap.php

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
use xPDO\Transport\xPDOTransport;
3+
24
/**
35
* Include bootstrap when installing the package
46
*

Diff for: ‎_build/gpm_resolvers/gpm.resolve.element_property_set.php

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?php
2+
use xPDO\Transport\xPDOTransport;
3+
4+
/**
5+
* Include bootstrap when installing the package
6+
*
7+
* THIS RESOLVER IS AUTOMATICALLY GENERATED, NO CHANGES WILL APPLY
8+
*
9+
* @package collections
10+
* @subpackage build
11+
*
12+
* @var \MODX\Revolution\modCategory $object
13+
* @var \MODX\Revolution\modX $modx
14+
* @var array $options
15+
* @var array $fileMeta
16+
*/
17+
18+
$modx =& $object->xpdo;
19+
if ($options[xPDOTransport::PACKAGE_ACTION] === xPDOTransport::ACTION_UNINSTALL) return true;
20+
21+
$propertySetsCache = [];
22+
23+
$elementClasses = [
24+
'snippets' => 'MODX\\Revolution\\modSnippet',
25+
'chunks' => 'MODX\\Revolution\\modChunk',
26+
'templates' => 'MODX\\Revolution\\modTemplate',
27+
'plugins' => 'MODX\\Revolution\\modPlugin',
28+
];
29+
30+
foreach ($elementClasses as $type => $elementClass) {
31+
if (isset($fileMeta[$type]) && is_array($fileMeta[$type])) {
32+
foreach ($fileMeta[$type] as $elementName => $propertySets) {
33+
/** @var \MODX\Revolution\modElement $element */
34+
$element = $modx->getObject($elementClass, ['name' => $elementName]);
35+
if (!$element) continue;
36+
37+
if (empty($propertySets)) {
38+
$modx->removeCollection(\MODX\Revolution\modElementPropertySet::class, ['element' => $element->id, 'element_class' => $elementClass]);
39+
continue;
40+
}
41+
42+
if (!is_array($propertySets)) continue;
43+
44+
foreach ($propertySets as $propertySetName) {
45+
if (!isset($propertySetsCache[$propertySetName])) {
46+
/** @var \MODX\Revolution\modPropertySet $propertySet */
47+
$propertySet = $modx->getObject(\MODX\Revolution\modPropertySet::class, ['name' => $propertySetName]);
48+
if (!$propertySet) continue;
49+
50+
$propertySetsCache[$propertySetName] = $propertySet->id;
51+
}
52+
53+
$elementPropertySet = $modx->getObject(\MODX\Revolution\modElementPropertySet::class, ['element' => $element->id, 'element_class' => $elementClass, 'property_set' => $propertySetsCache[$propertySetName]]);
54+
if ($elementPropertySet) continue;
55+
56+
$elementPropertySet = $modx->newObject(\MODX\Revolution\modElementPropertySet::class);
57+
$elementPropertySet->set('element', $element->id);
58+
$elementPropertySet->set('element_class', $elementClass);
59+
$elementPropertySet->set('property_set', $propertySetsCache[$propertySetName]);
60+
$elementPropertySet->save();
61+
}
62+
}
63+
}
64+
}
65+
66+
return true;

Diff for: ‎_build/scripts/resolve.synctables.php renamed to ‎_build/gpm_scripts/gpm.script.sync_tables.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
2+
use MODX\Revolution\modX;
3+
use xPDO\Transport\xPDOTransport;
4+
25
/**
3-
* @var \Teleport\Transport\Transport $transport
6+
* @var \xPDO\Transport\xPDOTransport $transport
47
* @var array $object
58
* @var array $options
69
*/
710

8-
use MODX\Revolution\modX;
9-
1011
set_time_limit(0);
1112

12-
1313
if (!function_exists('updateTableColumns')) {
1414
/**
1515
* @param $modx
@@ -113,8 +113,8 @@ function alterTable($modx, $table)
113113
\Collections\Model\CollectionTemplate::class,
114114
\Collections\Model\CollectionTemplateColumn::class,
115115
\Collections\Model\CollectionResourceTemplate::class,
116-
\Collections\Model\CollectionSelection::class
117-
];
116+
\Collections\Model\CollectionSelection::class,
117+
];
118118

119119
foreach ($tables as $table) {
120120
$modx->log(modX::LOG_LEVEL_INFO, 'Altering table: ' . $table);

Diff for: ‎_build/gpm_scripts/gpm.script.tables.php

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
use xPDO\Transport\xPDOTransport;
3+
24
/**
35
* Create tables
46
*
@@ -7,7 +9,7 @@
79
* @package collections
810
* @subpackage build.scripts
911
*
10-
* @var \Teleport\Transport\Transport $transport
12+
* @var \xPDO\Transport\xPDOTransport $transport
1113
* @var array $object
1214
* @var array $options
1315
*/
@@ -18,10 +20,10 @@
1820

1921
$manager = $modx->getManager();
2022

21-
$manager->createObjectContainer('\Collections\Model\CollectionSetting');
22-
$manager->createObjectContainer('\Collections\Model\CollectionTemplate');
23-
$manager->createObjectContainer('\Collections\Model\CollectionTemplateColumn');
24-
$manager->createObjectContainer('\Collections\Model\CollectionResourceTemplate');
25-
$manager->createObjectContainer('\Collections\Model\CollectionSelection');
23+
$manager->createObjectContainer(\Collections\Model\CollectionSetting::class);
24+
$manager->createObjectContainer(\Collections\Model\CollectionTemplate::class);
25+
$manager->createObjectContainer(\Collections\Model\CollectionTemplateColumn::class);
26+
$manager->createObjectContainer(\Collections\Model\CollectionResourceTemplate::class);
27+
$manager->createObjectContainer(\Collections\Model\CollectionSelection::class);
2628

2729
return true;

Diff for: ‎_build/resolvers/resolve.customevents.php

-36
This file was deleted.

Diff for: ‎_build/resolvers/resolve.defaulttemplate.php

-98
This file was deleted.

Diff for: ‎_build/resolvers/resolve.fixselections.php

-16
This file was deleted.

Diff for: ‎_build/resolvers/resolve.fixsystemsettings.php

-17
This file was deleted.

0 commit comments

Comments
 (0)