Skip to content

Commit b640ed5

Browse files
committed
remove referred applications
1 parent 0c56632 commit b640ed5

File tree

2 files changed

+1
-66
lines changed

2 files changed

+1
-66
lines changed

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/smallstuff/ComposerFile.xtend

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.zikula.modulestudio.generator.cartridges.symfony.smallstuff
22

33
import de.guite.modulestudio.metamodel.Application
4-
import de.guite.modulestudio.metamodel.ApplicationDependencyType
54
import de.guite.modulestudio.metamodel.EmailValidationMode
6-
import de.guite.modulestudio.metamodel.ReferredApplication
75
import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
86
import org.zikula.modulestudio.generator.extensions.FormattingExtensions
97
import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
@@ -45,7 +43,6 @@ class ComposerFile {
4543
"psr-4": { "«vendor.formatForCodeCapital»\\«name.formatForCodeCapital»Bundle\\": "" }
4644
},
4745
"require": {
48-
«var dependencies = referredApplications.filter[dependencyType == ApplicationDependencyType.REQUIREMENT
4946
"php": ">=8.2",
5047
"doctrine/doctrine-migrations-bundle": "^3.2",
5148
«IF generatePdfSupport»
@@ -62,23 +59,10 @@ class ComposerFile {
6259
«ENDIF»
6360
"zikula/core-bundle": "^«targetZikulaVersion»",
6461
"zikula/theme-bundle": "^«targetZikulaVersion»",
65-
"zikula/users-bundle": "^«targetZikulaVersion»"«IF !dependencies.empty»,«ENDIF»
66-
«IF !dependencies.empty»
67-
«FOR referredApp : dependencies»
68-
«dependency(referredApp)»«IF referredApp != dependencies.last»,«ENDIF»
69-
«ENDFOR»
70-
«ENDIF»
62+
"zikula/users-bundle": "^«targetZikulaVersion»"
7163
},
7264
"require-dev": {
7365
},
74-
«{ dependencies = referredApplications.filter[dependencyType == ApplicationDependencyType.RECOMMENDATION]; ''
75-
«IF !dependencies.empty»
76-
"suggest": {
77-
«FOR referredApp : dependencies»
78-
«dependency(referredApp)»«IF referredApp != dependencies.last»,«ENDIF»
79-
«ENDFOR»
80-
},
81-
«ENDIF»
8266
"config": {
8367
"vendor-dir": "vendor",
8468
"preferred-install": "dist",
@@ -87,10 +71,6 @@ class ComposerFile {
8771
}
8872
'''
8973
90-
def private dependency(Application it, ReferredApplication dependency) '''
91-
"«dependency.name»:>=«dependency.minVersion»«/*,<=«dependency.maxVersion»*/»": "«IF null !== dependency.documentation && !dependency.documentation.empty»«dependency.documentation.formatForDisplay»«ELSE»«dependency.name» application«ENDIF»"
92-
'''
93-
9474
// Reference: http://www.spdx.org/licenses/
9575
def private licenseSPDX(Application it) {
9676
switch license {

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/smallstuff/techdocs/TechStructure.xtend

-45
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.zikula.modulestudio.generator.cartridges.symfony.smallstuff.techdocs
22

33
import de.guite.modulestudio.metamodel.Application
4-
import de.guite.modulestudio.metamodel.ApplicationDependencyType
54
import de.guite.modulestudio.metamodel.DataObject
65
import de.guite.modulestudio.metamodel.Entity
76
import de.guite.modulestudio.metamodel.Variables
@@ -30,46 +29,13 @@ class TechStructure {
3029

3130
def private content(Application it) '''
3231
«helper.basicInfo(it, language
33-
«IF !referredApplications.empty»
34-
<h2><i class="fas fa-link"></i> «IF language == 'de'»Abhängigkeiten«ELSE»Dependencies«ENDIF»</h2>
35-
«helper.table(it, dependenciesColumns, dependenciesHeader, dependenciesContent
36-
«ENDIF»
3732
«entityInfo»
3833
«IF needsConfig»
3934
«variableInfo»
4035
«ENDIF»
4136
«settingsInfo»
4237
'''
4338

44-
def private dependenciesColumns(Application it) '''
45-
<colgroup>
46-
<col id="cDepApplicationName" />
47-
<col id="cDepMinVersion" />
48-
<col id="cDepMaxVersion" />
49-
<col id="cDepType" />
50-
</colgroup>
51-
'''
52-
53-
def private dependenciesHeader(Application it) '''
54-
<tr>
55-
<th id="hDepApplicationName" scope="col">«IF language == 'de'»Anwendung«ELSE»Application«ENDIF»</th>
56-
<th id="hDepMinVersion" scope="col">«IF language == 'de'»Min. Version«ELSE»Min version«ENDIF»</th>
57-
<th id="hDepMaxVersion" scope="col">«IF language == 'de'»Max. Version«ELSE»Max version«ENDIF»</th>
58-
<th id="hDepType" scope="col">«IF language == 'de'»Art der Abhängigkeit«ELSE»Dependency type«ENDIF»</th>
59-
</tr>
60-
'''
61-
62-
def private dependenciesContent(Application it) '''
63-
«FOR referredApp : referredApplications»
64-
<tr>
65-
<th id="hDep«referredApp.name.formatForCodeCapital»" scope="row" headers="hDepApplicationName">«referredApp.name.formatForCodeCapital»</th>
66-
<td headers="hDepMinVersion hDep«referredApp.name.formatForCodeCapital»">«referredApp.minVersion»</td>
67-
<td headers="hDepMaxVersion hDep«referredApp.name.formatForCodeCapital»">«referredApp.maxVersion»</td>
68-
<td headers="hDepType hDep«referredApp.name.formatForCodeCapital»">«referredApp.dependencyType.literal» &ndash; «referredApp.dependencyType.dependencyTypeDescription»</td>
69-
</tr>
70-
«ENDFOR»
71-
'''
72-
7339
def dispatch private CharSequence entityInfo(Application it) '''
7440
<h2><i class="fas fa-database"></i> «IF language == 'de'»Datentabellen«ELSE»Data tables«ENDIF»</h2>
7541
«FOR entity : entities»
@@ -135,15 +101,4 @@ class TechStructure {
135101
<h2><i class="fas fa-puzzle-piece"></i> «IF language == 'de'»Integrationseinstellungen«ELSE»Integration settings«ENDIF»</h2>
136102
«new TechStructureSettings().generate(it, language
137103
'''
138-
139-
def private dependencyTypeDescription(ApplicationDependencyType it) {
140-
switch (it) {
141-
case REQUIREMENT:
142-
return if (language == 'de') 'wird benötigt, zum Beispiel zum Verknüpfen verbundener Entitäten' else 'is required, for example to join related entities'
143-
case RECOMMENDATION:
144-
return if (language == 'de') 'wird empfohlen, zum Beispiel zum Anbieten erweiterter Integrationsfunktionen' else 'is recommended, for example to provide enhanced integration functionality'
145-
case CONFLICT:
146-
return if (language == 'de') 'steht in Konflikt, zum Beispiel auf Grund überlappender Funktionalität' else 'is in conflict, for example due to overlapping functionality'
147-
}
148-
}
149104
}

0 commit comments

Comments
 (0)