Skip to content

Commit aa53353

Browse files
stefanheimesstefanheimes
committed
Merge remote-tracking branch 'origin/hotfix-2.0.0-alpha7'
2 parents e8d8bcb + 064d211 commit aa53353

File tree

15 files changed

+312
-112
lines changed

15 files changed

+312
-112
lines changed

‎.gitattributes

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.check-author.yml
2+
.gitattributes export-ignore
3+
.gitignore export-ignore
4+
.travis.yml export-ignore
5+
build.default.properties export-ignore
6+
build.xml export-ignore
7+
phpunit.xml.dist export-ignore
8+
/tests export-ignore

‎.travis.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
language: php
22

33
php:
4-
- 5.3
5-
- 5.4
6-
- 5.5
7-
- 5.6
4+
- "5.3"
5+
- "5.4"
6+
- "5.5"
7+
- "5.6"
8+
- "7.0"
89

910
env:
1011
- CONTAO_VERSION=~3.2.0
@@ -15,7 +16,7 @@ env:
1516
# Exclude impossible Contao Version combinations.
1617
matrix:
1718
exclude:
18-
- php: 5.3
19+
- php: "5.3"
1920
env: CONTAO_VERSION=~3.5.0
2021

2122
sudo: false

‎LICENSE

+165
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
},
3434
"require-dev": {
3535
"cyberspectrum/contao-toolbox": "~0.6",
36-
"phpcq/all-tasks": "~1.0",
36+
"phpcq/all-tasks": "~1.1",
3737
"metamodels/base-unit-tests": "~1.0"
3838
},
3939
"conflict": {

‎contao/config/autoload.php

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
* The Front-End modules allow you to build powerful listing and filtering of the
66
* data in each collection.
77
*
8-
* PHP version 5
9-
* @package MetaModels
10-
* @subpackage AttributeSelect
11-
* @author Christian Schiffler <[email protected]>
12-
* @author Andreas Isaak <[email protected]>
13-
* @copyright The MetaModels team.
14-
* @license LGPL.
8+
* @package MetaModels
9+
* @subpackage AttributeSelect
10+
* @author Christian Schiffler <[email protected]>
11+
* @author Andreas Isaak <[email protected]>
12+
* @copyright 2012-2016 The MetaModels team.
13+
* @license https://github.com/MetaModels/attribute_select/blob/master/LICENSE LGPL-3.0
1514
* @filesource
1615
*/
1716

‎contao/config/event_listeners.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
* The Front-End modules allow you to build powerful listing and filtering of the
66
* data in each collection.
77
*
8-
* PHP version 5
9-
* @package MetaModels
10-
* @subpackage AttributeSelect
11-
* @author Christian Schiffler <[email protected]>
12-
* @copyright The MetaModels team.
13-
* @license LGPL.
8+
* @package MetaModels
9+
* @subpackage AttributeSelect
10+
* @author Christian Schiffler <[email protected]>
11+
* @copyright 2012-2016 The MetaModels team.
12+
* @license https://github.com/MetaModels/attribute_select/blob/master/LICENSE LGPL-3.0
1413
* @filesource
1514
*/
1615

‎contao/dca/tl_metamodel_attribute.php

+9-10
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
* The Front-End modules allow you to build powerful listing and filtering of the
66
* data in each collection.
77
*
8-
* PHP version 5
9-
* @package MetaModels
10-
* @subpackage AttributeSelect
11-
* @author Christian Schiffler <[email protected]>
12-
* @author Christian de la Haye <[email protected]>
13-
* @author Stefan heimes <[email protected]>
14-
* @author Andreas Isaak <[email protected]>
15-
* @copyright The MetaModels team.
16-
* @license LGPL.
8+
* @package MetaModels
9+
* @subpackage AttributeSelect
10+
* @author Christian Schiffler <[email protected]>
11+
* @author Christian de la Haye <[email protected]>
12+
* @author Stefan heimes <[email protected]>
13+
* @author Andreas Isaak <[email protected]>
14+
* @copyright 2012-2016 The MetaModels team.
15+
* @license https://github.com/MetaModels/attribute_select/blob/master/LICENSE LGPL-3.0
1716
* @filesource
1817
*/
1918

2019
/**
21-
* Table tl_metamodel_attribute
20+
* Table tl_metamodel_attribute
2221
*/
2322

2423
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['metapalettes']['select extends _simpleattribute_'] = array

‎contao/dca/tl_metamodel_dcasetting.php

+8-9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
* The Front-End modules allow you to build powerful listing and filtering of the
66
* data in each collection.
77
*
8-
* PHP version 5
9-
* @package MetaModels
10-
* @subpackage AttributeSelect
11-
* @author Christian Schiffler <[email protected]>
12-
* @author Andreas Isaak <[email protected]>
13-
* @author Oliver Hoff <[email protected]>
14-
* @author Stefan heimes <[email protected]>
15-
* @copyright The MetaModels team.
16-
* @license LGPL.
8+
* @package MetaModels
9+
* @subpackage AttributeSelect
10+
* @author Christian Schiffler <[email protected]>
11+
* @author Andreas Isaak <[email protected]>
12+
* @author Oliver Hoff <[email protected]>
13+
* @author Stefan heimes <[email protected]>
14+
* @copyright 2012-2016 The MetaModels team.
15+
* @license https://github.com/MetaModels/attribute_select/blob/master/LICENSE LGPL-3.0
1716
* @filesource
1817
*/
1918

‎src/MetaModels/Attribute/Select/AbstractSelect.php

+16-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
* The Front-End modules allow you to build powerful listing and filtering of the
66
* data in each collection.
77
*
8-
* PHP version 5
9-
*
10-
* @package MetaModels
11-
* @subpackage AttributeSelect
12-
* @author Christian Schiffler <[email protected]>
13-
* @author Stefan Heimes <[email protected]>
14-
* @copyright The MetaModels team.
15-
* @license LGPL.
8+
* @package MetaModels
9+
* @subpackage AttributeSelect
10+
* @author Christian Schiffler <[email protected]>
11+
* @author Stefan Heimes <[email protected]>
12+
* @copyright 2012-2016 The MetaModels team.
13+
* @license https://github.com/MetaModels/attribute_select/blob/master/LICENSE LGPL-3.0
1614
* @filesource
1715
*/
1816

@@ -163,6 +161,15 @@ protected function isFilterOptionRetrievingPossible($idList)
163161
return $this->isProperlyConfigured() && (($idList === null) || !empty($idList));
164162
}
165163

164+
/**
165+
* Obtain the filter options with always the id being contained instead of the alias.
166+
*
167+
* This is being called from BackendSubscriber to circumvent problems when dealing with translated aliases.
168+
*
169+
* @return array
170+
*/
171+
abstract public function getFilterOptionsForDcGeneral();
172+
166173
/**
167174
* {@inheritdoc}
168175
*/
@@ -214,7 +221,7 @@ public function getAttributeSettingNames()
214221
/**
215222
* {@inheritdoc}
216223
*
217-
* search value in table
224+
* Search value in table.
218225
*/
219226
public function searchFor($strPattern)
220227
{

‎src/MetaModels/Attribute/Select/AttributeTypeFactory.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
* The Front-End modules allow you to build powerful listing and filtering of the
66
* data in each collection.
77
*
8-
* PHP version 5
9-
* @package MetaModels
10-
* @subpackage AttributeSelect
11-
* @author Christian Schiffler <[email protected]>
12-
* @copyright The MetaModels team.
13-
* @license LGPL.
8+
* @package MetaModels
9+
* @subpackage AttributeSelect
10+
* @author Christian Schiffler <[email protected]>
11+
* @copyright 2012-2016 The MetaModels team.
12+
* @license https://github.com/MetaModels/attribute_select/blob/master/LICENSE LGPL-3.0
1413
* @filesource
1514
*/
1615

0 commit comments

Comments
 (0)