| @@ -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 | * | 
| @@ -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 | }; | 
| @@ -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 | } | 
| @@ -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 | } |