Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 33c55be

Browse files
fetzifetzi
authored
Merge pull request #4 from fetzi/config
Inject whole config object instead of single value
2 parents 786ffeb + 40ee251 commit 33c55be

File tree

7 files changed

+228
-14
lines changed

7 files changed

+228
-14
lines changed

‎.editorconfig‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# editorconfig.org
2+
3+
root = true
4+
5+
# Global
6+
7+
[*]
8+
charset = utf-8
9+
end_of_line = lf
10+
indent_style = space
11+
indent_size = 4
12+
insert_final_newline = true
13+
trim_trailing_whitespace = true
14+
15+
# Languages
16+
17+
[*.md]
18+
trim_trailing_whitespace = false

‎LICENSE‎

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
Copyright 2017 karriere.at Informationsdienstleistung GmbH
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
6+
Unless required by applicable law or agreed to in writing, software
7+
distributed under the License is distributed on an "AS IS" BASIS,
8+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9+
See the License for the specific language governing permissions and
10+
limitations under the License.
11+
12+
13+
Apache License
14+
Version 2.0, January 2004
15+
http://www.apache.org/licenses/
16+
17+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
18+
19+
1. Definitions.
20+
21+
"License" shall mean the terms and conditions for use, reproduction,
22+
and distribution as defined by Sections 1 through 9 of this document.
23+
24+
"Licensor" shall mean the copyright owner or entity authorized by
25+
the copyright owner that is granting the License.
26+
27+
"Legal Entity" shall mean the union of the acting entity and all
28+
other entities that control, are controlled by, or are under common
29+
control with that entity. For the purposes of this definition,
30+
"control" means (i) the power, direct or indirect, to cause the
31+
direction or management of such entity, whether by contract or
32+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
33+
outstanding shares, or (iii) beneficial ownership of such entity.
34+
35+
"You" (or "Your") shall mean an individual or Legal Entity
36+
exercising permissions granted by this License.
37+
38+
"Source" form shall mean the preferred form for making modifications,
39+
including but not limited to software source code, documentation
40+
source, and configuration files.
41+
42+
"Object" form shall mean any form resulting from mechanical
43+
transformation or translation of a Source form, including but
44+
not limited to compiled object code, generated documentation,
45+
and conversions to other media types.
46+
47+
"Work" shall mean the work of authorship, whether in Source or
48+
Object form, made available under the License, as indicated by a
49+
copyright notice that is included in or attached to the work
50+
(an example is provided in the Appendix below).
51+
52+
"Derivative Works" shall mean any work, whether in Source or Object
53+
form, that is based on (or derived from) the Work and for which the
54+
editorial revisions, annotations, elaborations, or other modifications
55+
represent, as a whole, an original work of authorship. For the purposes
56+
of this License, Derivative Works shall not include works that remain
57+
separable from, or merely link (or bind by name) to the interfaces of,
58+
the Work and Derivative Works thereof.
59+
60+
"Contribution" shall mean any work of authorship, including
61+
the original version of the Work and any modifications or additions
62+
to that Work or Derivative Works thereof, that is intentionally
63+
submitted to Licensor for inclusion in the Work by the copyright owner
64+
or by an individual or Legal Entity authorized to submit on behalf of
65+
the copyright owner. For the purposes of this definition, "submitted"
66+
means any form of electronic, verbal, or written communication sent
67+
to the Licensor or its representatives, including but not limited to
68+
communication on electronic mailing lists, source code control systems,
69+
and issue tracking systems that are managed by, or on behalf of, the
70+
Licensor for the purpose of discussing and improving the Work, but
71+
excluding communication that is conspicuously marked or otherwise
72+
designated in writing by the copyright owner as "Not a Contribution."
73+
74+
"Contributor" shall mean Licensor and any individual or Legal Entity
75+
on behalf of whom a Contribution has been received by Licensor and
76+
subsequently incorporated within the Work.
77+
78+
2. Grant of Copyright License. Subject to the terms and conditions of
79+
this License, each Contributor hereby grants to You a perpetual,
80+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
81+
copyright license to reproduce, prepare Derivative Works of,
82+
publicly display, publicly perform, sublicense, and distribute the
83+
Work and such Derivative Works in Source or Object form.
84+
85+
3. Grant of Patent License. Subject to the terms and conditions of
86+
this License, each Contributor hereby grants to You a perpetual,
87+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
88+
(except as stated in this section) patent license to make, have made,
89+
use, offer to sell, sell, import, and otherwise transfer the Work,
90+
where such license applies only to those patent claims licensable
91+
by such Contributor that are necessarily infringed by their
92+
Contribution(s) alone or by combination of their Contribution(s)
93+
with the Work to which such Contribution(s) was submitted. If You
94+
institute patent litigation against any entity (including a
95+
cross-claim or counterclaim in a lawsuit) alleging that the Work
96+
or a Contribution incorporated within the Work constitutes direct
97+
or contributory patent infringement, then any patent licenses
98+
granted to You under this License for that Work shall terminate
99+
as of the date such litigation is filed.
100+
101+
4. Redistribution. You may reproduce and distribute copies of the
102+
Work or Derivative Works thereof in any medium, with or without
103+
modifications, and in Source or Object form, provided that You
104+
meet the following conditions:
105+
106+
(a) You must give any other recipients of the Work or
107+
Derivative Works a copy of this License; and
108+
109+
(b) You must cause any modified files to carry prominent notices
110+
stating that You changed the files; and
111+
112+
(c) You must retain, in the Source form of any Derivative Works
113+
that You distribute, all copyright, patent, trademark, and
114+
attribution notices from the Source form of the Work,
115+
excluding those notices that do not pertain to any part of
116+
the Derivative Works; and
117+
118+
(d) If the Work includes a "NOTICE" text file as part of its
119+
distribution, then any Derivative Works that You distribute must
120+
include a readable copy of the attribution notices contained
121+
within such NOTICE file, excluding those notices that do not
122+
pertain to any part of the Derivative Works, in at least one
123+
of the following places: within a NOTICE text file distributed
124+
as part of the Derivative Works; within the Source form or
125+
documentation, if provided along with the Derivative Works; or,
126+
within a display generated by the Derivative Works, if and
127+
wherever such third-party notices normally appear. The contents
128+
of the NOTICE file are for informational purposes only and
129+
do not modify the License. You may add Your own attribution
130+
notices within Derivative Works that You distribute, alongside
131+
or as an addendum to the NOTICE text from the Work, provided
132+
that such additional attribution notices cannot be construed
133+
as modifying the License.
134+
135+
You may add Your own copyright statement to Your modifications and
136+
may provide additional or different license terms and conditions
137+
for use, reproduction, or distribution of Your modifications, or
138+
for any such Derivative Works as a whole, provided Your use,
139+
reproduction, and distribution of the Work otherwise complies with
140+
the conditions stated in this License.
141+
142+
5. Submission of Contributions. Unless You explicitly state otherwise,
143+
any Contribution intentionally submitted for inclusion in the Work
144+
by You to the Licensor shall be under the terms and conditions of
145+
this License, without any additional terms or conditions.
146+
Notwithstanding the above, nothing herein shall supersede or modify
147+
the terms of any separate license agreement you may have executed
148+
with Licensor regarding such Contributions.
149+
150+
6. Trademarks. This License does not grant permission to use the trade
151+
names, trademarks, service marks, or product names of the Licensor,
152+
except as required for reasonable and customary use in describing the
153+
origin of the Work and reproducing the content of the NOTICE file.
154+
155+
7. Disclaimer of Warranty. Unless required by applicable law or
156+
agreed to in writing, Licensor provides the Work (and each
157+
Contributor provides its Contributions) on an "AS IS" BASIS,
158+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
159+
implied, including, without limitation, any warranties or conditions
160+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
161+
PARTICULAR PURPOSE. You are solely responsible for determining the
162+
appropriateness of using or redistributing the Work and assume any
163+
risks associated with Your exercise of permissions under this License.
164+
165+
8. Limitation of Liability. In no event and under no legal theory,
166+
whether in tort (including negligence), contract, or otherwise,
167+
unless required by applicable law (such as deliberate and grossly
168+
negligent acts) or agreed to in writing, shall any Contributor be
169+
liable to You for damages, including any direct, indirect, special,
170+
incidental, or consequential damages of any character arising as a
171+
result of this License or out of the use or inability to use the
172+
Work (including but not limited to damages for loss of goodwill,
173+
work stoppage, computer failure or malfunction, or any and all
174+
other commercial damages or losses), even if such Contributor
175+
has been advised of the possibility of such damages.
176+
177+
9. Accepting Warranty or Additional Liability. While redistributing
178+
the Work or Derivative Works thereof, You may choose to offer,
179+
and charge a fee for, acceptance of support, warranty, indemnity,
180+
or other liability obligations and/or rights consistent with this
181+
License. However, in accepting such obligations, You may act only
182+
on Your own behalf and on Your sole responsibility, not on behalf
183+
of any other Contributor, and only if You agree to indemnify,
184+
defend, and hold each Contributor harmless for any liability
185+
incurred by, or claims asserted against, such Contributor by reason
186+
of your accepting any such warranty or additional liability.
187+
188+
END OF TERMS AND CONDITIONS

‎config/mocky.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22

33
return [
4-
'spec-dir' => __DIR__ . '/../example',
5-
];
4+
'directory' => __DIR__ . '/../example',
5+
];

‎public/index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
include __DIR__ . "/../vendor/autoload.php";
3+
include __DIR__ . '/../vendor/autoload.php';
44

55
$config = new \Karriere\Mocky\Configuration(__DIR__ . '/../config/mocky.php');
66

7-
$mocky = new \Karriere\Mocky\Mocky($config['spec-dir']);
7+
$mocky = new \Karriere\Mocky\Mocky($config);
88

9-
$mocky->run();
9+
$mocky->run();

‎readme.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</p>
66

77

8-
# Mocky - A simple api mock server
8+
# Mocky - A simple API mock server
99

1010
Mocky is a simple API mocking solution written in PHP based on the [Slim Framework](https://www.slimframework.com/).
1111

@@ -39,7 +39,7 @@ The root elements of the test definintion defines the request methods. Each requ
3939
The key of each request definition is the route (e.g. `/users`). Each request definitions must define a `content-type` and a `mock` field. The mock field is a reference to the mock data file to deliver.
4040

4141
### Mock Data
42-
A mock data file contains an array of mock responses. Each mock response must have a `status` and a `response` field. The `status` field defines the HTTP status code and the `response` field the api response in json format.
42+
A mock data file contains an array of mock responses. Each mock response must have a `status` and a `response` field. The `status` field defines the HTTP status code and the `response` field the API response in json format.
4343

4444
Use `example/mocks/users/list-users.json` as a reference.
4545

@@ -54,7 +54,7 @@ The scope variable is needed to allow parallel access to mocky from different ap
5454

5555
This endpoint call will setup the `users-simple` test case defined in `tests/users-simple.json`.
5656

57-
To be able to use another scope you simply call the `setup` route with your custom scope name and on each real api call you need to include a request header called `Mocky-Scope` with the custom scope name as value.
57+
To be able to use another scope you simply call the `setup` route with your custom scope name and on each real API call you need to include a request header called `Mocky-Scope` with the custom scope name as value.
5858

5959
<a href="http://www.youtube.com/watch?feature=player_embedded&v=UYyWKrbJjAM" target="_blank"><img src="http://img.youtube.com/vi/UYyWKrbJjAM/0.jpg" alt="Mocky Demo" width="240" height="180" border="10" /></a>
6060

@@ -93,3 +93,6 @@ server {
9393

9494
### Apache
9595
Your document root points to the `public` directory and you need to make sure that `mod_rewrite` is available.
96+
97+
## License
98+
Apache License 2.0 Please see [LICENSE](LICENSE) for more information.

‎src/Configuration.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ public function __construct($configFile)
1515
parent::__construct($this->load($configFile));
1616
}
1717

18+
public function __get($name)
19+
{
20+
return $this[$name];
21+
}
22+
1823
private function load($file)
1924
{
2025
return require $file;

‎src/Mocky.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ class Mocky
1515
private $app;
1616

1717
/**
18-
* @var string
18+
* @var Configuration
1919
*/
20-
private $configDirectory;
20+
private $config;
2121

22-
public function __construct($configDirectory)
22+
public function __construct(Configuration $config)
2323
{
2424
$this->app = new App();
2525

26-
$this->configDirectory = $configDirectory;
26+
$this->config = $config;
2727

2828
if (session_status() == PHP_SESSION_NONE) {
2929
session_start();
@@ -40,8 +40,8 @@ public function __construct($configDirectory)
4040

4141
$state = State::load($scope);
4242

43-
(new TestRouter($this->configDirectory))->setup($this->app, $state);
44-
(new MockyRouter($this->configDirectory))->setup($this->app, $state);
43+
(new TestRouter($this->config->directory))->setup($this->app, $state);
44+
(new MockyRouter($this->config->directory))->setup($this->app, $state);
4545
}
4646

4747
public function run()

0 commit comments

Comments
 (0)