Skip to content

Commit 7ea975b

Browse files
solleersolleer
committed
Update to Dice 3.0
1 parent 222b443 commit 7ea975b

3 files changed

Lines changed: 57 additions & 54 deletions

File tree

‎composer.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"require" : {
77
"solleer/mvc" : "^1.0",
88
"level-2/maphper" : "^0.9",
9+
"solleer/maphper-loader" : "^2.0.0",
10+
"solleer/transphporm-messages": "^1.0",
11+
"respect/validation": "^1.1",
912
"simshaun/recurr" : "^3.0"
1013
}
1114
}

‎src/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"model" : {
3636
"instanceOf" : "Events\\Model\\Event",
3737
"substitutions" : {
38-
"MVC\\Model\\Id" : { "instance" : "$event_id_model" }
38+
"MVC\\Model\\Id" : { "Dice::INSTANCE" : "$event_id_model" }
3939
}
4040
},
4141
"controller" : { "instanceOf" : "MVC\\Controller\\Id"},

‎src/validation_config.json‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"Events\\Model\\SingleEvents" : {
3-
"substitutions" : {"Maphper\\Maphper" : {"instance" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}}
3+
"substitutions" : {"Maphper\\Maphper" : {"Dice::INSTANCE" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}}
44
},
55
"Events\\Model\\RepeatingEvents" : {
6-
"substitutions" : {"Maphper\\Maphper" : {"instance" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}}
6+
"substitutions" : {"Maphper\\Maphper" : {"Dice::INSTANCE" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}}
77
},
88
"Events\\Model\\Events" : {
99
"constructParams" : [
10-
{"instance" : "Events\\Model\\SingleEvents"},
11-
{"instance" : "Events\\Model\\RepeatingEvents"}
10+
{"Dice::INSTANCE" : "Events\\Model\\SingleEvents"},
11+
{"Dice::INSTANCE" : "Events\\Model\\RepeatingEvents"}
1212
]
1313
},
1414
"Events\\Model\\Calendar" : {
1515
"substitutions" : {
16-
"Events\\Model\\EventsStorage" : {"instance" : "Events\\Model\\Events"}
16+
"Events\\Model\\EventsStorage" : {"Dice::INSTANCE" : "Events\\Model\\Events"}
1717
}
1818
},
1919
"Recurr\\Transformer\\TextTransformer" : {
2020
"substitutions" : {
21-
"Recurr\\Transformer\\TranslatorInterface" : { "instance" : "Recurr\\Transformer\\Translator", "params" : ["en", "en"]}
21+
"Recurr\\Transformer\\TranslatorInterface" : { "Dice::INSTANCE" : "Recurr\\Transformer\\Translator", "params" : ["en", "en"]}
2222
}
2323
},
2424
"Recurr\\Transformer\\Translator" : {
@@ -29,52 +29,52 @@
2929
},
3030
"Events\\Model\\Form" : {
3131
"constructParams" : [
32-
{"instance" : "$event_saver"}
32+
{"Dice::INSTANCE" : "$event_saver"}
3333
]
3434
},
3535
"$event_id_model" : {
3636
"instanceOf" : "MVC\\Model\\Id",
37-
"substitutions" : {"ArrayAccess" : {"instance" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}}
37+
"substitutions" : {"ArrayAccess" : {"Dice::INSTANCE" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}}
3838
},
3939
"$event_saver" : {
4040
"instanceOf" : "MVC\\Model\\Form\\Save",
4141
"constructParams" : [
42-
{"instance" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]},
43-
{"instance" : "$events_validate_event"}
42+
{"Dice::INSTANCE" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]},
43+
{"Dice::INSTANCE" : "$events_validate_event"}
4444
]
4545
},
4646
"$event_deleter" : {
4747
"instanceOf" : "MVC\\Model\\Form\\Delete",
48-
"constructParams" : [{"instance" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}, "id"]
48+
"constructParams" : [{"Dice::INSTANCE" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["events"]}, "id"]
4949
},
5050
"$event_repeat_saver" : {
5151
"instanceOf" : "MVC\\Model\\Form\\Save",
5252
"constructParams" : [
53-
{"instance" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["repeat_events"]},
54-
{"instance" : "$events_validate_repeat"}
53+
{"Dice::INSTANCE" : ["MaphperLoader\\Json", "getMaphper"], "params" : ["repeat_events"]},
54+
{"Dice::INSTANCE" : "$events_validate_repeat"}
5555
]
5656
},
5757
"$events_validate_id" : {
5858
"instanceOf" : "Respect\\Validation\\Rules\\When",
5959
"constructParams" : [
60-
{"instance" : "Respect\\Validation\\Rules\\NotEmpty"},
61-
{"instance" : "Respect\\Validation\\Rules\\IntVal"},
62-
{"instance" : "Respect\\Validation\\Rules\\AlwaysValid" }
60+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\NotEmpty"},
61+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\IntVal"},
62+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\AlwaysValid" }
6363
]
6464
},
6565
"$events_validate_name" : {
6666
"instanceOf" : "Respect\\Validation\\Rules\\AllOf",
6767
"call" : [["addRules", [[
68-
{"instance" : "Respect\\Validation\\Rules\\Alnum"},
69-
{"instance" : "Respect\\Validation\\Rules\\Length", "params" : [1, 50]},
70-
{"instance" : "Respect\\Validation\\Rules\\NotEmpty"}
68+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Alnum"},
69+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Length", "params" : [1, 50]},
70+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\NotEmpty"}
7171
]]]]
7272
},
7373
"$events_validate_location" : {
7474
"instanceOf" : "Respect\\Validation\\Rules\\AllOf",
7575
"call" : [["addRules", [[
76-
{"instance" : "Respect\\Validation\\Rules\\Alnum", "params" : ["\n,"]},
77-
{"instance" : "Respect\\Validation\\Rules\\Length", "params" : [1, 300]}
76+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Alnum", "params" : ["\n,"]},
77+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Length", "params" : [1, 300]}
7878
]]]]
7979
},
8080
"$events_validate_description" : {
@@ -86,67 +86,67 @@
8686
"$events_validate_date" : {
8787
"instanceOf" : "Respect\\Validation\\Rules\\AllOf",
8888
"call" : [["addRules", [[
89-
{"instance" : "Respect\\Validation\\Rules\\Date"}
89+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Date"}
9090
]]]]
9191
},
9292
"$events_validate_date_or1" : {
9393
"instanceOf" : "Respect\\Validation\\Rules\\OneOf",
9494
"call" : [["addRules", [[
95-
{"instance" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["end_date", "min", "start_date"]},
96-
{"instance" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "equals", "end_date"]}
95+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["end_date", "min", "start_date"]},
96+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "equals", "end_date"]}
9797
]]]]
9898
},
9999
"$events_validate_date_or2" : {
100100
"instanceOf" : "Respect\\Validation\\Rules\\OneOf",
101101
"call" : [["addRules", [[
102-
{"instance" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "max", "end_date"]},
103-
{"instance" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "equals", "end_date"]}
102+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "max", "end_date"]},
103+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "equals", "end_date"]}
104104
]]]]
105105
},
106106
"$events_validate_time" : {
107107
"instanceOf" : "Respect\\Validation\\Rules\\AllOf",
108108
"call" : [["addRules", [[
109-
{"instance" : "Respect\\Validation\\Rules\\Date", "params" : ["H:i"]}
109+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Date", "params" : ["H:i"]}
110110
]]]]
111111
},
112112
"$events_validate_event" : {
113113
"instanceOf" : "Respect\\Validation\\Rules\\AllOf",
114114
"call" : [["addRules", [[
115-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["id", {"instance" : "$events_validate_id"}, false]},
116-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["name", {"instance" : "$events_validate_name"}]},
117-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" :
118-
["location", {"instance" : "Respect\\Validation\\Rules\\Optional",
119-
"params" : [{"instance" : "$events_validate_description"}]}, false]},
120-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" :
121-
["description", {"instance" : "Respect\\Validation\\Rules\\Optional",
122-
"params" : [{"instance" : "$events_validate_description"}]}, false]},
123-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["start_date", {"instance" : "$events_validate_date"}]},
124-
{"instance" : "Respect\\Validation\\Rules\\When", "params" : [
125-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["repeat_id", {"instance" : "$events_validate_id"}]},
126-
{"instance" : "Respect\\Validation\\Rules\\AlwaysValid" },
127-
{"instance" : "Respect\\Validation\\Rules\\AllOf", "params" : [
128-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["end_date", {"instance" : "$events_validate_date"}]},
129-
{"instance" : "$events_validate_date_or1" },
130-
{"instance" : "$events_validate_date_or2" }
115+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["id", {"Dice::INSTANCE" : "$events_validate_id"}, false]},
116+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["name", {"Dice::INSTANCE" : "$events_validate_name"}]},
117+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" :
118+
["location", {"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Optional",
119+
"params" : [{"Dice::INSTANCE" : "$events_validate_description"}]}, false]},
120+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" :
121+
["description", {"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Optional",
122+
"params" : [{"Dice::INSTANCE" : "$events_validate_description"}]}, false]},
123+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["start_date", {"Dice::INSTANCE" : "$events_validate_date"}]},
124+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\When", "params" : [
125+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["repeat_id", {"Dice::INSTANCE" : "$events_validate_id"}]},
126+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\AlwaysValid" },
127+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\AllOf", "params" : [
128+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["end_date", {"Dice::INSTANCE" : "$events_validate_date"}]},
129+
{"Dice::INSTANCE" : "$events_validate_date_or1" },
130+
{"Dice::INSTANCE" : "$events_validate_date_or2" }
131131
]}
132132
]},
133-
{"instance" : "Respect\\Validation\\Rules\\When", "params" : [
134-
{"instance" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "equals", "end_date"]},
135-
{"instance" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_time", "max", "end_time"]},
136-
{"instance" : "Respect\\Validation\\Rules\\AlwaysValid" }
133+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\When", "params" : [
134+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_date", "equals", "end_date"]},
135+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\KeyValue", "params" : ["start_time", "max", "end_time"]},
136+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\AlwaysValid" }
137137
]},
138-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["start_time", {"instance" : "$events_validate_time"}]},
139-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["end_time", {"instance" : "$events_validate_time"}]},
140-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["repeat_id", {"instance" : "$events_validate_id"}, false]}
138+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["start_time", {"Dice::INSTANCE" : "$events_validate_time"}]},
139+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["end_time", {"Dice::INSTANCE" : "$events_validate_time"}]},
140+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["repeat_id", {"Dice::INSTANCE" : "$events_validate_id"}, false]}
141141
]]]]
142142
},
143143
"$events_validate_repeat" : {
144144
"instanceOf" : "Respect\\Validation\\Rules\\AllOf",
145145
"constructParams" : [
146-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["freq",
147-
{"instance" : "Respect\\Validation\\Rules\\In", "params" : [["weekly"]]}
146+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["freq",
147+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\In", "params" : [["weekly"]]}
148148
]},
149-
{"instance" : "Respect\\Validation\\Rules\\Key", "params" : ["interval_num", {"instance" : "$events_validate_id"}]}
149+
{"Dice::INSTANCE" : "Respect\\Validation\\Rules\\Key", "params" : ["interval_num", {"Dice::INSTANCE" : "$events_validate_id"}]}
150150
]
151151
}
152152
}

0 commit comments

Comments
 (0)