@@ -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()); |
@@ -35,10 +35,10 @@ |
||
35 | 35 | $container['googleAnalytics'] = function($c) { |
36 | 36 | $ga = new \TheIconic\Tracking\GoogleAnalytics\Analytics(true); |
37 | 37 | $ga->setProtocolVersion(1) |
38 | - ->setTrackingId($c->get('settings')['ga']['trackingCode']) |
|
39 | - ->setClientId(\Sabre\VObject\UUIDUtil::getUUID()) |
|
40 | - ->setAnonymizeIp(true) |
|
41 | - ->setAsyncRequest(true); |
|
38 | + ->setTrackingId($c->get('settings')['ga']['trackingCode']) |
|
39 | + ->setClientId(\Sabre\VObject\UUIDUtil::getUUID()) |
|
40 | + ->setAnonymizeIp(true) |
|
41 | + ->setAsyncRequest(true); |
|
42 | 42 | |
43 | 43 | return $ga; |
44 | 44 | }; |
@@ -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 | } |
@@ -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; |
@@ -56,7 +56,7 @@ |
||
56 | 56 | 'uri' => 'http://andreas.heigl.org', |
57 | 57 | ]); |
58 | 58 | $feed->setDateModified(time()); |
59 | - if (! isset($data['cfps'])) { |
|
59 | + if (!isset($data['cfps'])) { |
|
60 | 60 | $data['cfps'] = []; |
61 | 61 | } |
62 | 62 | foreach ($data['cfps'] as $cfp) { |
@@ -36,7 +36,7 @@ |
||
36 | 36 | { |
37 | 37 | /** |
38 | 38 | * |
39 | - * @param Response $response |
|
39 | + * @param ResponseInterface $response |
|
40 | 40 | * @param array $data |
41 | 41 | * @param int $status |
42 | 42 | * |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | public function render(ResponseInterface $response, array $data = [], $status = 200) |
46 | 46 | { |
47 | 47 | $icalendar = new VCalendar(); |
48 | - if (! isset($data['cfps'])) { |
|
48 | + if (!isset($data['cfps'])) { |
|
49 | 49 | $data['cfps'] = []; |
50 | 50 | } |
51 | 51 | foreach ($data['cfps'] as $cfp) { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | 'DTSTAMP' => $lastChange, |
67 | 67 | 'UID' => $cfp['_rel']['cfp_uri'], |
68 | 68 | 'DESCRIPTION' => $cfp['description'], |
69 | - 'GEO' => round($cfp['latitude'], 6) . ';' . round($cfp['longitude'], 6), |
|
69 | + 'GEO' => round($cfp['latitude'], 6).';'.round($cfp['longitude'], 6), |
|
70 | 70 | 'LOCATION' => $cfp['location'], |
71 | 71 | |
72 | 72 | ]); |
@@ -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(); |
@@ -51,7 +51,7 @@ |
||
51 | 51 | callable $next |
52 | 52 | ) { |
53 | 53 | $query = $request->getQueryParams(); |
54 | - if (! isset($query['type'])) { |
|
54 | + if (!isset($query['type'])) { |
|
55 | 55 | return $next($request, $response); |
56 | 56 | } |
57 | 57 |
@@ -60,13 +60,13 @@ |
||
60 | 60 | $response = $next($request, $response); |
61 | 61 | |
62 | 62 | $this->analytics |
63 | - ->setEventCategory($request->getUri()->getPath()) |
|
64 | - ->setEventAction($request->getMethod()) |
|
65 | - ->setEventLabel('type') |
|
66 | - ->setEventValue($response->getHeader('Content-Type')[0]) |
|
67 | - ->setIpOverride($request->getAttribute('ip_address')) |
|
68 | - ->setUserAgentOverride($request->getHeader('User-Agent')[0]) |
|
69 | - ->sendEvent(); |
|
63 | + ->setEventCategory($request->getUri()->getPath()) |
|
64 | + ->setEventAction($request->getMethod()) |
|
65 | + ->setEventLabel('type') |
|
66 | + ->setEventValue($response->getHeader('Content-Type')[0]) |
|
67 | + ->setIpOverride($request->getAttribute('ip_address')) |
|
68 | + ->setUserAgentOverride($request->getHeader('User-Agent')[0]) |
|
69 | + ->sendEvent(); |
|
70 | 70 | |
71 | 71 | return $response; |
72 | 72 | } |
@@ -36,7 +36,6 @@ |
||
36 | 36 | use Camel\Format\CamelCase; |
37 | 37 | use Camel\Format\SnakeCase; |
38 | 38 | use DateTime; |
39 | -use Monolog\Logger; |
|
40 | 39 | use Org_Heigl\PdoTimezoneHelper\Handler\PdoTimezoneHandlerInterface; |
41 | 40 | |
42 | 41 | class CfpPersistenceLayer |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $cfp->setDateCfpStart(new \DateTimeImmutable()); |
72 | 72 | } |
73 | 73 | $statement = 'INSERT into `cfp`(`dateCfpStart`, `dateCfpEnd`, `dateEventStart`, `dateEventEnd`, `name`, `uri`, `hash`, `timezone`, `description`, `eventUri`, `iconUri`, `latitude`, `longitude`, `location`, `tags`, `source`, `lastUpdate`) ' . |
74 | - 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :source, :lastUpdate);'; |
|
74 | + 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :source, :lastUpdate);'; |
|
75 | 75 | $statement = $this->pdo->prepare($statement); |
76 | 76 | |
77 | 77 | $values = [ |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | |
135 | 135 | foreach ($options as $option) { |
136 | 136 | $method = 'get' . $option; |
137 | - // Merge values from tags and source before comparing! |
|
137 | + // Merge values from tags and source before comparing! |
|
138 | 138 | if (in_array($option, ['tags', 'source'])) { |
139 | 139 | $setter = 'set' . $option; |
140 | 140 | $cfp->$setter(array_merge($oldValues->$method(), $cfp->$method())); |
@@ -163,9 +163,9 @@ discard block |
||
163 | 163 | } |
164 | 164 | |
165 | 165 | $statement = 'UPDATE `cfp` SET ' |
166 | - . implode(',', $statementElements) . ',' |
|
167 | - . '`lastUpdate` = :lastUpdate ' |
|
168 | - . 'WHERE `hash` = :fetchHash'; |
|
166 | + . implode(',', $statementElements) . ',' |
|
167 | + . '`lastUpdate` = :lastUpdate ' |
|
168 | + . 'WHERE `hash` = :fetchHash'; |
|
169 | 169 | $statement = $this->pdo->prepare($statement); |
170 | 170 | $values['fetchHash'] = $fetchHash; |
171 | 171 | $values['lastUpdate'] = (new \DateTime('now', new \DateTimezone('UTC')))->format('c'); |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | $cfp->setLocation($item['location']); |
357 | 357 | $cfp->setTags(explode(',', $item['tags'])); |
358 | 358 | $cfp->setLastUpdated(new \DateTimeImmutable($item['lastUpdate'])); |
359 | - // $cfp->setSource(explode(',', $item['source'])); |
|
359 | + // $cfp->setSource(explode(',', $item['source'])); |
|
360 | 360 | |
361 | 361 | $list->add($cfp); |
362 | 362 | } |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | if ($cfp->getDateCfpStart()->getTimestamp() < 10000) { |
71 | 71 | $cfp->setDateCfpStart(new \DateTimeImmutable()); |
72 | 72 | } |
73 | - $statement = 'INSERT into `cfp`(`dateCfpStart`, `dateCfpEnd`, `dateEventStart`, `dateEventEnd`, `name`, `uri`, `hash`, `timezone`, `description`, `eventUri`, `iconUri`, `latitude`, `longitude`, `location`, `tags`, `source`, `lastUpdate`) ' . |
|
73 | + $statement = 'INSERT into `cfp`(`dateCfpStart`, `dateCfpEnd`, `dateEventStart`, `dateEventEnd`, `name`, `uri`, `hash`, `timezone`, `description`, `eventUri`, `iconUri`, `latitude`, `longitude`, `location`, `tags`, `source`, `lastUpdate`) '. |
|
74 | 74 | 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :source, :lastUpdate);'; |
75 | 75 | $statement = $this->pdo->prepare($statement); |
76 | 76 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | public function update(Cfp $cfp, $fetchHash) |
105 | 105 | { |
106 | - if (! $fetchHash) { |
|
106 | + if (!$fetchHash) { |
|
107 | 107 | throw new \UnexpectedValueException('No Hash given', 400); |
108 | 108 | } |
109 | 109 | $oldValues = $this->select($fetchHash); |
@@ -133,17 +133,17 @@ discard block |
||
133 | 133 | ]; |
134 | 134 | |
135 | 135 | foreach ($options as $option) { |
136 | - $method = 'get' . $option; |
|
136 | + $method = 'get'.$option; |
|
137 | 137 | // Merge values from tags and source before comparing! |
138 | 138 | if (in_array($option, ['tags', 'source'])) { |
139 | - $setter = 'set' . $option; |
|
139 | + $setter = 'set'.$option; |
|
140 | 140 | $cfp->$setter(array_merge($oldValues->$method(), $cfp->$method())); |
141 | 141 | } |
142 | 142 | if ($cfp->$method() !== $oldValues->$method()) { |
143 | 143 | if ($option == 'dateCfpStart' && $cfp->$method()->getTimestamp() < 100000) { |
144 | 144 | continue; |
145 | 145 | } |
146 | - $statementElements[] = '`' . $option . '` = :' . $option; |
|
146 | + $statementElements[] = '`'.$option.'` = :'.$option; |
|
147 | 147 | $values[$option] = $cfp->$method(); |
148 | 148 | if ($values[$option] instanceof \DateTimeInterface) { |
149 | 149 | $values[$option] = $values[$option]->format('c'); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | } |
164 | 164 | |
165 | 165 | $statement = 'UPDATE `cfp` SET ' |
166 | - . implode(',', $statementElements) . ',' |
|
166 | + . implode(',', $statementElements).',' |
|
167 | 167 | . '`lastUpdate` = :lastUpdate ' |
168 | 168 | . 'WHERE `hash` = :fetchHash'; |
169 | 169 | $statement = $this->pdo->prepare($statement); |
@@ -299,10 +299,10 @@ discard block |
||
299 | 299 | $values = []; |
300 | 300 | $where = []; |
301 | 301 | foreach ($parameters as $key => $value) { |
302 | - if (! in_array($key, $fields)) { |
|
302 | + if (!in_array($key, $fields)) { |
|
303 | 303 | continue; |
304 | 304 | } |
305 | - if (! is_array($value)) { |
|
305 | + if (!is_array($value)) { |
|
306 | 306 | $value = [$value]; |
307 | 307 | } |
308 | 308 | foreach ($value as $itemkey => $item) { |
@@ -313,22 +313,22 @@ discard block |
||
313 | 313 | 'date_event_end', |
314 | 314 | 'date_event_start' |
315 | 315 | ])) { |
316 | - if (array_key_exists($key . '_compare', $parameters) && isset($parameters[$key . '_compare'][$itemkey]) && in_array($parameters[$key . '_compare'][$itemkey], ['=', '<', '>', '<>'])) { |
|
317 | - $compare = $parameters[$key . '_compare'][$itemkey]; |
|
316 | + if (array_key_exists($key.'_compare', $parameters) && isset($parameters[$key.'_compare'][$itemkey]) && in_array($parameters[$key.'_compare'][$itemkey], ['=', '<', '>', '<>'])) { |
|
317 | + $compare = $parameters[$key.'_compare'][$itemkey]; |
|
318 | 318 | } |
319 | - $where[] = $this->timezoneHelper->getUtcDateTime($transformer->transform($key)) . ' ' . $compare . ' :' . $key . '_' . $itemkey; |
|
319 | + $where[] = $this->timezoneHelper->getUtcDateTime($transformer->transform($key)).' '.$compare.' :'.$key.'_'.$itemkey; |
|
320 | 320 | $value = (new DateTime($item))->setTimezone(new \DateTimeZone('UTC'))->format('c'); |
321 | 321 | } else { |
322 | - $where[] = '`' . $transformer->transform($key) . '` ' . $compare . ' :' . $key; |
|
322 | + $where[] = '`'.$transformer->transform($key).'` '.$compare.' :'.$key; |
|
323 | 323 | } |
324 | - $values[$key . '_' . $itemkey] = $value; |
|
324 | + $values[$key.'_'.$itemkey] = $value; |
|
325 | 325 | } |
326 | 326 | } |
327 | - if (! $where) { |
|
327 | + if (!$where) { |
|
328 | 328 | throw new \UnexpectedValueException('No CFPs found', 404); |
329 | 329 | } |
330 | 330 | |
331 | - $statement .= implode(' AND ', $where) . ' ORDER BY dateCfpEnd ASC'; |
|
331 | + $statement .= implode(' AND ', $where).' ORDER BY dateCfpEnd ASC'; |
|
332 | 332 | |
333 | 333 | $statement = $this->pdo->prepare($statement); |
334 | 334 |