@@ -4,13 +4,13 @@ |
||
4 | 4 | $container = $app->getContainer(); |
5 | 5 | |
6 | 6 | // view renderer |
7 | -$container['renderer'] = function ($c) { |
|
7 | +$container['renderer'] = function($c) { |
|
8 | 8 | $settings = $c->get('settings')['renderer']; |
9 | 9 | return new Slim\Views\PhpRenderer($settings['template_path']); |
10 | 10 | }; |
11 | 11 | |
12 | 12 | // monolog |
13 | -$container['logger'] = function ($c) { |
|
13 | +$container['logger'] = function($c) { |
|
14 | 14 | $settings = $c->get('settings')['logger']; |
15 | 15 | $logger = new Monolog\Logger($settings['name']); |
16 | 16 | $logger->pushProcessor(new Monolog\Processor\UidProcessor()); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $missingFields = []; |
50 | 50 | |
51 | 51 | foreach ($requiredFields as $field) { |
52 | - if (! isset($params[$field])) { |
|
52 | + if (!isset($params[$field])) { |
|
53 | 53 | $missingFields[] = $field; |
54 | 54 | } |
55 | 55 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | public static function setName(Cfp $cfp, array $array) |
83 | 83 | { |
84 | - if (! isset($array['name'])) { |
|
84 | + if (!isset($array['name'])) { |
|
85 | 85 | throw new \InvalidArgumentException('Name has to be specified'); |
86 | 86 | } |
87 | 87 | $cfp->setName(filter_var($array['name'], FILTER_SANITIZE_STRING)); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | public static function setDateCfpStart(Cfp $cfp, array $array) |
91 | 91 | { |
92 | - if (! isset($array['dateCfpStart'])) { |
|
92 | + if (!isset($array['dateCfpStart'])) { |
|
93 | 93 | throw new \InvalidArgumentException('CFP-StartDate has to be specified'); |
94 | 94 | } |
95 | 95 | $cfp->setDateCfpStart(new DateTimeImmutable($array['dateCfpStart'])); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | public static function setDateCfpEnd(Cfp $cfp, array $array) |
99 | 99 | { |
100 | - if (! isset($array['dateCfpEnd'])) { |
|
100 | + if (!isset($array['dateCfpEnd'])) { |
|
101 | 101 | throw new \InvalidArgumentException('CFP-EndDate has to be specified'); |
102 | 102 | } |
103 | 103 | $cfp->setDateCfpEnd(new DateTimeImmutable($array['dateCfpEnd'])); |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | public static function setTimezone(Cfp $cfp, array $array) |
107 | 107 | { |
108 | - if (! isset($array['timezone'])) { |
|
108 | + if (!isset($array['timezone'])) { |
|
109 | 109 | throw new \InvalidArgumentException('Timezone has to be specified'); |
110 | 110 | } |
111 | 111 | $cfp->setTimezone(filter_var($array['timezone'], FILTER_SANITIZE_STRING)); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | public static function setUri(Cfp $cfp, array $array) |
115 | 115 | { |
116 | - if (! isset($array['uri'])) { |
|
116 | + if (!isset($array['uri'])) { |
|
117 | 117 | throw new \InvalidArgumentException('URI has to be specified'); |
118 | 118 | } |
119 | 119 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | |
123 | 123 | public static function setEventUri(Cfp $cfp, array $array) |
124 | 124 | { |
125 | - if (! isset($array['eventUri'])) { |
|
125 | + if (!isset($array['eventUri'])) { |
|
126 | 126 | throw new \InvalidArgumentException('Event-URI has to be specified'); |
127 | 127 | } |
128 | 128 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | |
150 | 150 | public static function setIconUri(Cfp $cfp, array $array) |
151 | 151 | { |
152 | - if (! isset($array['iconUri'])) { |
|
152 | + if (!isset($array['iconUri'])) { |
|
153 | 153 | return; |
154 | 154 | } |
155 | 155 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | public static function setDescription(Cfp $cfp, array $array) |
160 | 160 | { |
161 | - if (! isset($array['description'])) { |
|
161 | + if (!isset($array['description'])) { |
|
162 | 162 | return; |
163 | 163 | } |
164 | 164 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | |
168 | 168 | public static function setLocation(Cfp $cfp, array $array) |
169 | 169 | { |
170 | - if (! isset($array['location'])) { |
|
170 | + if (!isset($array['location'])) { |
|
171 | 171 | return; |
172 | 172 | } |
173 | 173 | |
@@ -176,11 +176,11 @@ discard block |
||
176 | 176 | |
177 | 177 | public static function setGeolocation(Cfp $cfp, array $array) |
178 | 178 | { |
179 | - if (! isset($array['latitude'])) { |
|
179 | + if (!isset($array['latitude'])) { |
|
180 | 180 | return; |
181 | 181 | } |
182 | 182 | |
183 | - if (! isset($array['longitude'])) { |
|
183 | + if (!isset($array['longitude'])) { |
|
184 | 184 | return; |
185 | 185 | } |
186 | 186 | |
@@ -213,11 +213,11 @@ discard block |
||
213 | 213 | |
214 | 214 | public static function setTags(Cfp $cfp, array $array) |
215 | 215 | { |
216 | - if (! isset($array['tags'])) { |
|
216 | + if (!isset($array['tags'])) { |
|
217 | 217 | return; |
218 | 218 | } |
219 | 219 | |
220 | - $cfp->setTags(array_map(function ($item) { |
|
220 | + $cfp->setTags(array_map(function($item) { |
|
221 | 221 | return filter_var($item, FILTER_SANITIZE_STRING); |
222 | 222 | }, $array['tags'])); |
223 | 223 | } |
@@ -241,7 +241,7 @@ |
||
241 | 241 | |
242 | 242 | public function setTimezone($timezone) |
243 | 243 | { |
244 | - if (! $timezone instanceof \DateTimeZone) { |
|
244 | + if (!$timezone instanceof \DateTimeZone) { |
|
245 | 245 | $timezone = new \DateTimeZone($timezone); |
246 | 246 | } |
247 | 247 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | 'tags' => $cfp->getTags(), |
53 | 53 | 'lastChange' => $cfp->getLastUdated()->format('c'), |
54 | 54 | '_rel' => [ |
55 | - 'cfp_uri' => 'v1/cfp/' . $cfp->getHash(), |
|
55 | + 'cfp_uri' => 'v1/cfp/'.$cfp->getHash(), |
|
56 | 56 | ] |
57 | 57 | ]; |
58 | 58 |
@@ -33,7 +33,7 @@ |
||
33 | 33 | |
34 | 34 | public function add(Cfp $cfp) |
35 | 35 | { |
36 | - if (! $this->has($cfp)) { |
|
36 | + if (!$this->has($cfp)) { |
|
37 | 37 | $this->cfps[] = $cfp; |
38 | 38 | } |
39 | 39 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | ), 400); |
57 | 57 | } |
58 | 58 | $statement = 'INSERT into `cfp`(`dateCfpStart`, `dateCfpEnd`, `dateEventStart`, `dateEventEnd`, `name`, `uri`, `hash`, `timezone`, `description`, `eventUri`, `iconUri`, `latitude`, `longitude`, `location`, `tags`, `lastUpdate`) ' . |
59 | - 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :lastUpdate);'; |
|
59 | + 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :lastUpdate);'; |
|
60 | 60 | $statement = $this->pdo->prepare($statement); |
61 | 61 | |
62 | 62 | $values = [ |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | $statement = 'UPDATE `cfp` SET ' |
139 | - . implode(',', $statementElements) . ',' |
|
140 | - . '`lastUpdate` = :lastUpdate ' |
|
141 | - . 'WHERE `hash` = :fetchHash'; |
|
139 | + . implode(',', $statementElements) . ',' |
|
140 | + . '`lastUpdate` = :lastUpdate ' |
|
141 | + . 'WHERE `hash` = :fetchHash'; |
|
142 | 142 | $statement = $this->pdo->prepare($statement); |
143 | 143 | $values['fetchHash'] = $fetchHash; |
144 | 144 | $values['lastUpdate'] = (new \DateTime('now', new \DateTimezone('UTC')))->format('c'); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $cfp->getEventUri() |
55 | 55 | ), 400); |
56 | 56 | } |
57 | - $statement = 'INSERT into `cfp`(`dateCfpStart`, `dateCfpEnd`, `dateEventStart`, `dateEventEnd`, `name`, `uri`, `hash`, `timezone`, `description`, `eventUri`, `iconUri`, `latitude`, `longitude`, `location`, `tags`, `lastUpdate`) ' . |
|
57 | + $statement = 'INSERT into `cfp`(`dateCfpStart`, `dateCfpEnd`, `dateEventStart`, `dateEventEnd`, `name`, `uri`, `hash`, `timezone`, `description`, `eventUri`, `iconUri`, `latitude`, `longitude`, `location`, `tags`, `lastUpdate`) '. |
|
58 | 58 | 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :lastUpdate);'; |
59 | 59 | $statement = $this->pdo->prepare($statement); |
60 | 60 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | |
88 | 88 | public function update(Cfp $cfp, $fetchHash) |
89 | 89 | { |
90 | - if (! $fetchHash) { |
|
90 | + if (!$fetchHash) { |
|
91 | 91 | throw new \UnexpectedValueException('No Hash given', 400); |
92 | 92 | } |
93 | 93 | $oldValues = $this->select($fetchHash); |
@@ -116,9 +116,9 @@ discard block |
||
116 | 116 | ]; |
117 | 117 | |
118 | 118 | foreach ($options as $option) { |
119 | - $method = 'get' . $option; |
|
119 | + $method = 'get'.$option; |
|
120 | 120 | if ($cfp->$method() != $oldValues->$method()) { |
121 | - $statementElements[] = '`' . $option . '` = :' . $option; |
|
121 | + $statementElements[] = '`'.$option.'` = :'.$option; |
|
122 | 122 | $values[$option] = $cfp->$method(); |
123 | 123 | if ($values[$option] instanceof \DateTimeInterface) { |
124 | 124 | $values[$option] = $values[$option]->format('c'); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | } |
136 | 136 | |
137 | 137 | $statement = 'UPDATE `cfp` SET ' |
138 | - . implode(',', $statementElements) . ',' |
|
138 | + . implode(',', $statementElements).',' |
|
139 | 139 | . '`lastUpdate` = :lastUpdate ' |
140 | 140 | . 'WHERE `hash` = :fetchHash'; |
141 | 141 | $statement = $this->pdo->prepare($statement); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | $bearer = explode(' ', $auth[0]); |
71 | - if (! isset($bearer[1])) { |
|
71 | + if (!isset($bearer[1])) { |
|
72 | 72 | return $this->getNoAuthResponse($response); |
73 | 73 | } |
74 | 74 | $bearer = $bearer[1]; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | |
88 | 88 | protected function getNoAuthResponse($response, $error = 'no token', $description = 'No Access-Token provided') |
89 | 89 | { |
90 | - $response = $response->withHeader('WWW-Authenticate', 'Bearer realm="callingallpapers", error="' . $error . '", error_desciption="' . $description . '"'); |
|
90 | + $response = $response->withHeader('WWW-Authenticate', 'Bearer realm="callingallpapers", error="'.$error.'", error_desciption="'.$description.'"'); |
|
91 | 91 | $response = $response->withStatus(401); |
92 | 92 | |
93 | 93 | return $response; |
@@ -27,22 +27,22 @@ |
||
27 | 27 | * @since 15.01.2016 |
28 | 28 | * @link http://github.com/heiglandreas/callingallpapers |
29 | 29 | */ |
30 | -require_once realpath(__DIR__ . '/../vendor/autoload.php'); |
|
30 | +require_once realpath(__DIR__.'/../vendor/autoload.php'); |
|
31 | 31 | |
32 | 32 | session_start(); |
33 | 33 | |
34 | 34 | // Instantiate the app |
35 | -$settings = require __DIR__ . '/../config/settings.php'; |
|
35 | +$settings = require __DIR__.'/../config/settings.php'; |
|
36 | 36 | $app = new \Slim\App($settings); |
37 | 37 | |
38 | 38 | // Set up dependencies |
39 | -require __DIR__ . '/../config/dependencies.php'; |
|
39 | +require __DIR__.'/../config/dependencies.php'; |
|
40 | 40 | |
41 | 41 | // Register middleware |
42 | -require __DIR__ . '/../config/middleware.php'; |
|
42 | +require __DIR__.'/../config/middleware.php'; |
|
43 | 43 | |
44 | 44 | // Register routes |
45 | -require __DIR__ . '/../config/routes.php'; |
|
45 | +require __DIR__.'/../config/routes.php'; |
|
46 | 46 | |
47 | 47 | // Run app |
48 | 48 | $app->run(); |
49 | 49 | \ No newline at end of file |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | \Psr\Http\Message\ResponseInterface $response |
42 | 42 | ) use ($app){ |
43 | 43 | $params = $request->getParsedBody(); |
44 | - if (! is_array($params)) { |
|
44 | + if (!is_array($params)) { |
|
45 | 45 | throw new UnexpectedValueException('Expected array'); |
46 | 46 | } |
47 | 47 | |
@@ -54,18 +54,18 @@ discard block |
||
54 | 54 | $cpl->insert($cfp); |
55 | 55 | |
56 | 56 | $uri = $request->getUri(); |
57 | - $uri = $uri->withPath('v1/cfp/' . $cfp->getId()); |
|
57 | + $uri = $uri->withPath('v1/cfp/'.$cfp->getId()); |
|
58 | 58 | return $response->withRedirect((string)$uri, 201); |
59 | 59 | }); |
60 | 60 | |
61 | 61 | |
62 | -$app->put('/v1/cfp/{hash}', function ( |
|
62 | +$app->put('/v1/cfp/{hash}', function( |
|
63 | 63 | \Psr\Http\Message\ServerRequestInterface $request, |
64 | 64 | \Psr\Http\Message\ResponseInterface $response, |
65 | 65 | array $args |
66 | 66 | ) use ($app){ |
67 | 67 | $params = $request->getParsedBody(); |
68 | - if (! is_array($params)) { |
|
68 | + if (!is_array($params)) { |
|
69 | 69 | throw new UnexpectedValueException('Expected array'); |
70 | 70 | } |
71 | 71 | |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | $cpl->update($cfp, $args['hash']); |
79 | 79 | |
80 | 80 | $uri = $request->getUri(); |
81 | - $uri = $uri->withPath('v1/cfp/' . $cfp->getId()); |
|
81 | + $uri = $uri->withPath('v1/cfp/'.$cfp->getId()); |
|
82 | 82 | return $response->withHeader('Location', (string)$uri)->withStatus(204); |
83 | 83 | }); |
84 | 84 | |
85 | 85 | |
86 | -$app->delete('/v1/cfp/{id}', function ( |
|
86 | +$app->delete('/v1/cfp/{id}', function( |
|
87 | 87 | \Psr\Http\Message\ServerRequestInterface $request, |
88 | 88 | \Psr\Http\Message\ResponseInterface $response |
89 | 89 | ) use ($app){ |