The formattening, part 1

2025-03-12 00:20:04 +01:00
parent ece3c8ab80
commit b6697e5750
31 changed files with 1420 additions and 1356 deletions
@@ -1,85 +1,83 @@
 <?php
-namespace pvv\side;

-use \DateTimeImmutable;
-use \PDO;
+declare(strict_types=1);
+
+namespace pvv\side;

 class DBActivity implements Activity {
  private $pdo;

-	public function __construct(PDO $pdo) {
-		$this->pdo = $pdo;
-	}
+  public function __construct(\PDO $pdo) {
+    $this->pdo = $pdo;
+  }

-	public function getAllEvents() {
-		$query = 'SELECT * FROM events ORDER BY id DESC';
-		$statement = $this->pdo->prepare($query);
-		$statement->execute();
+  public function getAllEvents() {
+    $query = 'SELECT * FROM events ORDER BY id DESC';
+    $statement = $this->pdo->prepare($query);
+    $statement->execute();

-		$events = [];
-		foreach($statement->fetchAll() as $dbEvent){
-			$event = new SimpleEvent(
-				$dbEvent['id'],
-				$dbEvent['name'],
-				DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['start']),
-				DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['stop']),
-				$dbEvent['organiser'],
-				$dbEvent['location'],
-				$dbEvent['description']
-			);
-			$events[] = $event;
-		}
+    $events = [];
+    foreach ($statement->fetchAll() as $dbEvent) {
+      $event = new SimpleEvent(
+        $dbEvent['id'],
+        $dbEvent['name'],
+        \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['start']),
+        \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['stop']),
+        $dbEvent['organiser'],
+        $dbEvent['location'],
+        $dbEvent['description']
+      );
+      $events[] = $event;
+    }

-		return $events;
-	}
+    return $events;
+  }

-	public function getEventByID($id) {
-		$query = 'SELECT * FROM events WHERE id=:id LIMIT 1';
-		$statement = $this->pdo->prepare($query);
-		$statement->bindParam(':id', $id, PDO::PARAM_INT);
-		$statement->execute();
+  public function getEventByID($id) {
+    $query = 'SELECT * FROM events WHERE id=:id LIMIT 1';
+    $statement = $this->pdo->prepare($query);
+    $statement->bindParam(':id', $id, \PDO::PARAM_INT);
+    $statement->execute();

-		$dbEvent = $statement->fetch();
-		$event = new SimpleEvent(
-			$dbEvent['id'],
-			$dbEvent['name'],
-			DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['start']),
-			DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['stop']),
-			$dbEvent['organiser'],
-			$dbEvent['location'],
-			$dbEvent['description']
-		);
+    $dbEvent = $statement->fetch();

-		return $event;
-	}
+    return new SimpleEvent(
+      $dbEvent['id'],
+      $dbEvent['name'],
+      \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['start']),
+      \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $dbEvent['stop']),
+      $dbEvent['organiser'],
+      $dbEvent['location'],
+      $dbEvent['description']
+    );
+  }

+  public function getNextEventFrom(\DateTimeImmutable $date) {
+    $query = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start > :date ORDER BY start ASC LIMIT 1';

-	public function getNextEventFrom(DateTimeImmutable $date) {
-		$query = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start > :date ORDER BY start ASC LIMIT 1';
-		return $this->retrieve($date, $query);
-	}
+    return $this->retrieve($date, $query);
+  }

-	public function getPreviousEventFrom(DateTimeImmutable $date) {
-		$query = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start < :date ORDER BY start DESC LIMIT 1';
-		return $this->retrieve($date, $query);
-	}
+  public function getPreviousEventFrom(\DateTimeImmutable $date) {
+    $query = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start < :date ORDER BY start DESC LIMIT 1';

-	private function retrieve($date, $query) {
-		$stmt = $this->pdo->prepare($query);
-		$stmt->execute(['date' => $date->format('Y-m-d H:i:s')]);
-		if ($result = $stmt->fetch(PDO::FETCH_ASSOC)){
-			$ev = new SimpleEvent(
-				$result['id'],
-				$result['name'],
-				DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['start']),
-				DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['stop']),
-				$result['organiser'],
-				$result['location'],
-				$result['description']
-			);
-			return $ev;
-		}
-		return null;
-	}
+    return $this->retrieve($date, $query);
+  }

+  private function retrieve($date, $query) {
+    $stmt = $this->pdo->prepare($query);
+    $stmt->execute(['date' => $date->format('Y-m-d H:i:s')]);
+    if ($result = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+      return new SimpleEvent(
+        $result['id'],
+        $result['name'],
+        \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['start']),
+        \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['stop']),
+        $result['organiser'],
+        $result['location'],
+        $result['description']
+      );
+    }
+
+  }
 }