Skip to content

Commit f366fe3

Browse files
committed
Merge pull request #99 from dpauli/master
Finalize 0.1.1.
2 parents fd24e25 + a0b56b7 commit f366fe3

File tree

47 files changed

+5424
-3824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+5424
-3824
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# 0.1.1 (22.02.2016)
2+
3+
## Features
4+
- #75 Enable setting the maximum wait time for next request.
5+
- #80 Save formatted value in price.
6+
7+
## Bugfixes
8+
- #76 Delete locale parameter of product getName().
9+
- #78 and #87 Fix and refactor slideshow.
10+
- #79 Fix Product getPrice.
11+
- #82 Use Shop in an unstatic way.
12+
- #83 Unstatic many objects.
13+
- #86 Fix output of some __toString() functions.
14+
15+
## Enhancements
16+
- #81 Use __toString() functions.
17+
118
# 0.1.0 (28.01.2016)
219

320
## Enhancements

build/epages-rest-php-0.1.1.phar

135 KB
Binary file not shown.

build/epages-rest-php.phar

12.8 KB
Binary file not shown.

doc/class-ep6.ContactInformation.html

Lines changed: 111 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,13 @@ <h1>Class ContactInformation</h1>
134134
0.1.0 Add a timestamp to save the next allowed REST call.<br>
135135
<b>Since:</b>
136136
0.1.0 Use a default Locale.<br>
137+
<b>Since:</b>
138+
0.1.1 The object can be echoed.<br>
139+
<b>Since:</b>
140+
0.1.1 Unstatic variables.<br>
137141
<b>See:</b>
138142
InformationTrait This trait has all information needed objects.<br>
139-
<b>Located at</b> <a href="source-class-ep6.ContactInformation.html#9-416" title="Go to source code">shopobjects/information/ContactInformation.class.php</a>
143+
<b>Located at</b> <a href="source-class-ep6.ContactInformation.html#9-464" title="Go to source code">shopobjects/information/ContactInformation.class.php</a>
140144
<br>
141145
</div>
142146

@@ -156,7 +160,7 @@ <h1>Class ContactInformation</h1>
156160

157161
<td class="name"><div>
158162
<a class="anchor" href="#_getDefaultTitle">#</a>
159-
<code><a href="source-class-ep6.ContactInformation.html#169-182" title="Go to source code">getDefaultTitle</a>( )</code>
163+
<code><a href="source-class-ep6.ContactInformation.html#174-188" title="Go to source code">getDefaultTitle</a>( )</code>
160164

161165
<div class="description short">
162166
<p>Gets the title in the default localization.</p>
@@ -184,6 +188,7 @@ <h4>Since</h4>
184188
<div class="list">
185189
0.0.0<br>
186190
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
191+
0.1.1 Unstatic every attributes.<br>
187192
</div>
188193
<h4>Api</h4>
189194
<div class="list">
@@ -205,7 +210,7 @@ <h4>Api</h4>
205210

206211
<td class="name"><div>
207212
<a class="anchor" href="#_getTitle">#</a>
208-
<code><a href="source-class-ep6.ContactInformation.html#184-198" title="Go to source code">getTitle</a>( )</code>
213+
<code><a href="source-class-ep6.ContactInformation.html#190-205" title="Go to source code">getTitle</a>( )</code>
209214

210215
<div class="description short">
211216
<p>Gets the title.</p>
@@ -231,6 +236,7 @@ <h4>Since</h4>
231236
0.0.0<br>
232237
0.1.0 Use a reload function.<br>
233238
0.1.0 Use the default Locale.<br>
239+
0.1.1 Unstatic every attributes.<br>
234240
</div>
235241
<h4>Api</h4>
236242
<div class="list">
@@ -252,7 +258,7 @@ <h4>Api</h4>
252258

253259
<td class="name"><div>
254260
<a class="anchor" href="#_getDefaultShortDescription">#</a>
255-
<code><a href="source-class-ep6.ContactInformation.html#200-213" title="Go to source code">getDefaultShortDescription</a>( )</code>
261+
<code><a href="source-class-ep6.ContactInformation.html#207-221" title="Go to source code">getDefaultShortDescription</a>( )</code>
256262

257263
<div class="description short">
258264
<p>Gets the short description in the default localization.</p>
@@ -280,6 +286,7 @@ <h4>Since</h4>
280286
<div class="list">
281287
0.0.0<br>
282288
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
289+
0.1.1 Unstatic every attributes.<br>
283290
</div>
284291
<h4>Api</h4>
285292
<div class="list">
@@ -301,7 +308,7 @@ <h4>Api</h4>
301308

302309
<td class="name"><div>
303310
<a class="anchor" href="#_getShortDescription">#</a>
304-
<code><a href="source-class-ep6.ContactInformation.html#215-229" title="Go to source code">getShortDescription</a>( )</code>
311+
<code><a href="source-class-ep6.ContactInformation.html#223-238" title="Go to source code">getShortDescription</a>( )</code>
305312

306313
<div class="description short">
307314
<p>Gets the short description.</p>
@@ -327,6 +334,7 @@ <h4>Since</h4>
327334
0.0.0<br>
328335
0.1.0 Use a reload function.<br>
329336
0.1.0 Use the default Locale.<br>
337+
0.1.1 Unstatic every attributes.<br>
330338
</div>
331339
<h4>Api</h4>
332340
<div class="list">
@@ -348,7 +356,7 @@ <h4>Api</h4>
348356

349357
<td class="name"><div>
350358
<a class="anchor" href="#_getDefaultCompany">#</a>
351-
<code><a href="source-class-ep6.ContactInformation.html#231-244" title="Go to source code">getDefaultCompany</a>( )</code>
359+
<code><a href="source-class-ep6.ContactInformation.html#240-254" title="Go to source code">getDefaultCompany</a>( )</code>
352360

353361
<div class="description short">
354362
<p>Gets the company in the default localization.</p>
@@ -376,6 +384,7 @@ <h4>Since</h4>
376384
<div class="list">
377385
0.0.0<br>
378386
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
387+
0.1.1 Unstatic every attributes.<br>
379388
</div>
380389
<h4>Api</h4>
381390
<div class="list">
@@ -397,7 +406,7 @@ <h4>Api</h4>
397406

398407
<td class="name"><div>
399408
<a class="anchor" href="#_getCompany">#</a>
400-
<code><a href="source-class-ep6.ContactInformation.html#246-260" title="Go to source code">getCompany</a>( )</code>
409+
<code><a href="source-class-ep6.ContactInformation.html#256-271" title="Go to source code">getCompany</a>( )</code>
401410

402411
<div class="description short">
403412
<p>Gets the company.</p>
@@ -423,6 +432,7 @@ <h4>Since</h4>
423432
0.0.0<br>
424433
0.1.0 Use a reload function.<br>
425434
0.1.0 Use the default Locale.<br>
435+
0.1.1 Unstatic every attributes.<br>
426436
</div>
427437
<h4>Api</h4>
428438
<div class="list">
@@ -444,7 +454,7 @@ <h4>Api</h4>
444454

445455
<td class="name"><div>
446456
<a class="anchor" href="#_getDefaultContactPerson">#</a>
447-
<code><a href="source-class-ep6.ContactInformation.html#262-275" title="Go to source code">getDefaultContactPerson</a>( )</code>
457+
<code><a href="source-class-ep6.ContactInformation.html#273-287" title="Go to source code">getDefaultContactPerson</a>( )</code>
448458

449459
<div class="description short">
450460
<p>Gets the contact person in the default localization.</p>
@@ -472,6 +482,7 @@ <h4>Since</h4>
472482
<div class="list">
473483
0.0.0<br>
474484
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
485+
0.1.1 Unstatic every attributes.<br>
475486
</div>
476487
<h4>Api</h4>
477488
<div class="list">
@@ -493,7 +504,7 @@ <h4>Api</h4>
493504

494505
<td class="name"><div>
495506
<a class="anchor" href="#_getContactPerson">#</a>
496-
<code><a href="source-class-ep6.ContactInformation.html#277-291" title="Go to source code">getContactPerson</a>( )</code>
507+
<code><a href="source-class-ep6.ContactInformation.html#289-304" title="Go to source code">getContactPerson</a>( )</code>
497508

498509
<div class="description short">
499510
<p>Gets the contact person.</p>
@@ -519,6 +530,7 @@ <h4>Since</h4>
519530
0.0.0<br>
520531
0.1.0 Use a reload function.<br>
521532
0.1.0 Use the default Locale.<br>
533+
0.1.1 Unstatic every attributes.<br>
522534
</div>
523535
<h4>Api</h4>
524536
<div class="list">
@@ -540,7 +552,7 @@ <h4>Api</h4>
540552

541553
<td class="name"><div>
542554
<a class="anchor" href="#_getDefaultContactPersonJobTitle">#</a>
543-
<code><a href="source-class-ep6.ContactInformation.html#293-306" title="Go to source code">getDefaultContactPersonJobTitle</a>( )</code>
555+
<code><a href="source-class-ep6.ContactInformation.html#306-320" title="Go to source code">getDefaultContactPersonJobTitle</a>( )</code>
544556

545557
<div class="description short">
546558
<p>Gets the job title of the contact person in the default localization.</p>
@@ -568,6 +580,7 @@ <h4>Since</h4>
568580
<div class="list">
569581
0.0.0<br>
570582
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
583+
0.1.1 Unstatic every attributes.<br>
571584
</div>
572585
<h4>Api</h4>
573586
<div class="list">
@@ -589,7 +602,7 @@ <h4>Api</h4>
589602

590603
<td class="name"><div>
591604
<a class="anchor" href="#_getContactPersonJobTitle">#</a>
592-
<code><a href="source-class-ep6.ContactInformation.html#308-322" title="Go to source code">getContactPersonJobTitle</a>( )</code>
605+
<code><a href="source-class-ep6.ContactInformation.html#322-337" title="Go to source code">getContactPersonJobTitle</a>( )</code>
593606

594607
<div class="description short">
595608
<p>Gets the job title of the contact person.</p>
@@ -615,6 +628,7 @@ <h4>Since</h4>
615628
0.0.0<br>
616629
0.1.0 Use a reload function.<br>
617630
0.1.0 Use the default Locale.<br>
631+
0.1.1 Unstatic every attributes.<br>
618632
</div>
619633
<h4>Api</h4>
620634
<div class="list">
@@ -636,7 +650,7 @@ <h4>Api</h4>
636650

637651
<td class="name"><div>
638652
<a class="anchor" href="#_getDefaultAddress">#</a>
639-
<code><a href="source-class-ep6.ContactInformation.html#324-337" title="Go to source code">getDefaultAddress</a>( )</code>
653+
<code><a href="source-class-ep6.ContactInformation.html#339-353" title="Go to source code">getDefaultAddress</a>( )</code>
640654

641655
<div class="description short">
642656
<p>Gets the address in the default localization.</p>
@@ -664,6 +678,7 @@ <h4>Since</h4>
664678
<div class="list">
665679
0.0.0<br>
666680
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
681+
0.1.1 Unstatic every attributes.<br>
667682
</div>
668683
<h4>Api</h4>
669684
<div class="list">
@@ -685,7 +700,7 @@ <h4>Api</h4>
685700

686701
<td class="name"><div>
687702
<a class="anchor" href="#_getAddress">#</a>
688-
<code><a href="source-class-ep6.ContactInformation.html#339-353" title="Go to source code">getAddress</a>( )</code>
703+
<code><a href="source-class-ep6.ContactInformation.html#355-370" title="Go to source code">getAddress</a>( )</code>
689704

690705
<div class="description short">
691706
<p>Gets the address.</p>
@@ -711,6 +726,7 @@ <h4>Since</h4>
711726
0.0.0<br>
712727
0.1.0 Use a reload function.<br>
713728
0.1.0 Use the default Locale.<br>
729+
0.1.1 Unstatic every attributes.<br>
714730
</div>
715731
<h4>Api</h4>
716732
<div class="list">
@@ -732,7 +748,7 @@ <h4>Api</h4>
732748

733749
<td class="name"><div>
734750
<a class="anchor" href="#_getDefaultPhone">#</a>
735-
<code><a href="source-class-ep6.ContactInformation.html#355-368" title="Go to source code">getDefaultPhone</a>( )</code>
751+
<code><a href="source-class-ep6.ContactInformation.html#372-386" title="Go to source code">getDefaultPhone</a>( )</code>
736752

737753
<div class="description short">
738754
<p>Gets the phone number in the default localization.</p>
@@ -760,6 +776,7 @@ <h4>Since</h4>
760776
<div class="list">
761777
0.0.0<br>
762778
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
779+
0.1.1 Unstatic every attributes.<br>
763780
</div>
764781
<h4>Api</h4>
765782
<div class="list">
@@ -781,7 +798,7 @@ <h4>Api</h4>
781798

782799
<td class="name"><div>
783800
<a class="anchor" href="#_getPhone">#</a>
784-
<code><a href="source-class-ep6.ContactInformation.html#370-384" title="Go to source code">getPhone</a>( )</code>
801+
<code><a href="source-class-ep6.ContactInformation.html#388-403" title="Go to source code">getPhone</a>( )</code>
785802

786803
<div class="description short">
787804
<p>Gets the phone number.</p>
@@ -807,6 +824,7 @@ <h4>Since</h4>
807824
0.0.0<br>
808825
0.1.0 Use a reload function.<br>
809826
0.1.0 Use the default Locale.<br>
827+
0.1.1 Unstatic every attributes.<br>
810828
</div>
811829
<h4>Api</h4>
812830
<div class="list">
@@ -828,7 +846,7 @@ <h4>Api</h4>
828846

829847
<td class="name"><div>
830848
<a class="anchor" href="#_getDefaultEmail">#</a>
831-
<code><a href="source-class-ep6.ContactInformation.html#386-399" title="Go to source code">getDefaultEmail</a>( )</code>
849+
<code><a href="source-class-ep6.ContactInformation.html#405-419" title="Go to source code">getDefaultEmail</a>( )</code>
832850

833851
<div class="description short">
834852
<p>Gets the email in the default localization.</p>
@@ -856,6 +874,7 @@ <h4>Since</h4>
856874
<div class="list">
857875
0.0.0<br>
858876
0.1.0 Deprecated because the Locale is everytime the configured Locale.<br>
877+
0.1.1 Unstatic every attributes.<br>
859878
</div>
860879
<h4>Api</h4>
861880
<div class="list">
@@ -877,7 +896,7 @@ <h4>Api</h4>
877896

878897
<td class="name"><div>
879898
<a class="anchor" href="#_getEmail">#</a>
880-
<code><a href="source-class-ep6.ContactInformation.html#401-415" title="Go to source code">getEmail</a>( )</code>
899+
<code><a href="source-class-ep6.ContactInformation.html#421-436" title="Go to source code">getEmail</a>( )</code>
881900

882901
<div class="description short">
883902
<p>Gets the email.</p>
@@ -903,6 +922,54 @@ <h4>Since</h4>
903922
0.0.0<br>
904923
0.1.0 Use a reload function.<br>
905924
0.1.0 Use the default Locale.<br>
925+
0.1.1 Unstatic every attributes.<br>
926+
</div>
927+
<h4>Api</h4>
928+
<div class="list">
929+
</div>
930+
931+
932+
</div>
933+
</div></td>
934+
</tr>
935+
<tr data-order="__toString" id="___toString">
936+
937+
<td class="attributes"><code>
938+
public
939+
940+
String
941+
942+
</code>
943+
</td>
944+
945+
<td class="name"><div>
946+
<a class="anchor" href="#___toString">#</a>
947+
<code><a href="source-class-ep6.ContactInformation.html#438-463" title="Go to source code">__toString</a>( )</code>
948+
949+
<div class="description short">
950+
<p>Prints the Information object as a string.</p>
951+
</div>
952+
953+
<div class="description detailed hidden">
954+
<p>Prints the Information object as a string.</p>
955+
956+
<p>This function returns the setted values of the Information object.</p>
957+
958+
959+
960+
<h4>Returns</h4>
961+
<div class="list">
962+
String<br>The Information as a string.
963+
</div>
964+
965+
966+
<h4>Author</h4>
967+
<div class="list">
968+
David Pauli <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#99;&#111;&#110;&#116;&#97;ct&#x40;&#x64;&#x61;&#x76;&#x69;&#x64;&#45;&#112;&#97;&#117;&#108;&#105;&#46;d&#x65;">&#99;&#111;&#110;&#116;&#97;ct&#x40;&#x64;&#x61;&#x76;&#x69;&#x64;&#45;&#112;&#97;&#117;&#108;&#105;&#46;d&#x65;</a><br>
969+
</div>
970+
<h4>Since</h4>
971+
<div class="list">
972+
0.1.1<br>
906973
</div>
907974
<h4>Api</h4>
908975
<div class="list">
@@ -934,6 +1001,33 @@ <h4>Api</h4>
9341001

9351002

9361003

1004+
<table class="summary constants" id="constants">
1005+
<caption>Constants summary</caption>
1006+
<tr data-order="RESTPATH" id="RESTPATH">
1007+
1008+
<td class="attributes"><code>String</code></td>
1009+
<td class="name">
1010+
<code>
1011+
<a href="source-class-ep6.ContactInformation.html#26-27" title="Go to source code"><b>RESTPATH</b></a>
1012+
</code>
1013+
1014+
<div class="description short">
1015+
1016+
</div>
1017+
1018+
<div class="description detailed hidden">
1019+
1020+
1021+
</div>
1022+
</td>
1023+
<td class="value">
1024+
<div>
1025+
<a href="#RESTPATH" class="anchor">#</a>
1026+
<code><span class="php-quote">&quot;legal/contact-information&quot;</span></code>
1027+
</div>
1028+
</td>
1029+
</tr>
1030+
</table>
9371031

9381032

9391033

0 commit comments

Comments
 (0)