@@ -27,10 +27,10 @@ discard block |
||
| 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 | $app = new \Slim\App; |
| 33 | -$app->get('/foo', function ($req, $res, $args) { |
|
| 33 | +$app->get('/foo', function($req, $res, $args) { |
|
| 34 | 34 | return $res->withHeader( |
| 35 | 35 | 'Content-Type', |
| 36 | 36 | 'application/json' |
@@ -40,17 +40,17 @@ discard block |
||
| 40 | 40 | session_start(); |
| 41 | 41 | |
| 42 | 42 | // Instantiate the app |
| 43 | -$settings = require __DIR__ . '/../config/settings.php'; |
|
| 43 | +$settings = require __DIR__.'/../config/settings.php'; |
|
| 44 | 44 | $app = new \Slim\App($settings); |
| 45 | 45 | |
| 46 | 46 | // Set up dependencies |
| 47 | -require __DIR__ . '/../config/dependencies.php'; |
|
| 47 | +require __DIR__.'/../config/dependencies.php'; |
|
| 48 | 48 | |
| 49 | 49 | // Register middleware |
| 50 | -require __DIR__ . '/../config/middleware.php'; |
|
| 50 | +require __DIR__.'/../config/middleware.php'; |
|
| 51 | 51 | |
| 52 | 52 | // Register routes |
| 53 | -require __DIR__ . '/../config/routes.php'; |
|
| 53 | +require __DIR__.'/../config/routes.php'; |
|
| 54 | 54 | |
| 55 | 55 | // Run app |
| 56 | 56 | $app->run(); |
| 57 | 57 | \ No newline at end of file |
@@ -55,12 +55,12 @@ discard block |
||
| 55 | 55 | $cpl->insert($cfp); |
| 56 | 56 | |
| 57 | 57 | $uri = $request->getUri(); |
| 58 | - $uri = $uri->withPath('v1/cfp/' . $cfp->getId()); |
|
| 58 | + $uri = $uri->withPath('v1/cfp/'.$cfp->getId()); |
|
| 59 | 59 | return $response->withRedirect((string)$uri, 201); |
| 60 | 60 | }); |
| 61 | 61 | |
| 62 | 62 | |
| 63 | -$app->put('/v1/cfp/{hash}', function ( |
|
| 63 | +$app->put('/v1/cfp/{hash}', function( |
|
| 64 | 64 | \Psr\Http\Message\ServerRequestInterface $request, |
| 65 | 65 | \Psr\Http\Message\ResponseInterface $response, |
| 66 | 66 | array $args |
@@ -76,12 +76,12 @@ discard block |
||
| 76 | 76 | $cpl->update($cfp, $args['hash']); |
| 77 | 77 | |
| 78 | 78 | $uri = $request->getUri(); |
| 79 | - $uri = $uri->withPath('v1/cfp/' . $cfp->getId()); |
|
| 79 | + $uri = $uri->withPath('v1/cfp/'.$cfp->getId()); |
|
| 80 | 80 | return $response->withHeader('Location', (string)$uri)->withStatus(204); |
| 81 | 81 | }); |
| 82 | 82 | |
| 83 | 83 | |
| 84 | -$app->delete('/v1/cfp/{id}', function ( |
|
| 84 | +$app->delete('/v1/cfp/{id}', function( |
|
| 85 | 85 | \Psr\Http\Message\ServerRequestInterface $request, |
| 86 | 86 | \Psr\Http\Message\ResponseInterface $response, |
| 87 | 87 | array $args |
@@ -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()); |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | 'DTSTAMP' => $lastChange, |
| 65 | 65 | 'UID' => $cfp['_rel']['cfp_uri'], |
| 66 | 66 | 'DESCRIPTION' => $cfp['description'], |
| 67 | - 'GEO' => round($cfp['latitude'], 6) . ';' . round($cfp['longitude'], 6), |
|
| 67 | + 'GEO' => round($cfp['latitude'], 6).';'.round($cfp['longitude'], 6), |
|
| 68 | 68 | 'LOCATION' => $cfp['location'], |
| 69 | 69 | |
| 70 | 70 | ]); |
@@ -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 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | // Rate-Limit is handlede by another Middleware |
| 64 | 64 | return $next($request, $response); |
| 65 | 65 | } |
| 66 | - if (! $auth) { |
|
| 66 | + if (!$auth) { |
|
| 67 | 67 | $response = $response->withHeader('WWW-Authenticate', 'Bearer realm="callingallpapers", error="no token", error_desciption="No Access-Token provided"'); |
| 68 | 68 | $response = $response->withStatus(401); |
| 69 | 69 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | $bearer = explode(' ', $auth[0]); |
| 74 | - if (! isset($bearer[1])) { |
|
| 74 | + if (!isset($bearer[1])) { |
|
| 75 | 75 | $response = $response->withHeader('WWW-Authenticate', 'Bearer realm="callingallpapers", error="no token", error_desciption="No Access-Token provided"'); |
| 76 | 76 | $response = $response->withStatus(401); |
| 77 | 77 | |