{{ f.submit(__('Save')) }}
diff --git a/resources/views/pages/password/reset.twig b/resources/views/pages/password/reset.twig
index 289152ea..b1de4eae 100644
--- a/resources/views/pages/password/reset.twig
+++ b/resources/views/pages/password/reset.twig
@@ -19,7 +19,7 @@
{{ csrf() }}
{{ __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.') }}
- {{ f.input('email', __('E-Mail'), 'email', true) }}
+ {{ f.input('email', __('E-Mail'), 'email', {'required': true}) }}
{{ f.submit(__('Recover')) }}
diff --git a/src/Helpers/Schedule/CalculatesTime.php b/src/Helpers/Schedule/CalculatesTime.php
new file mode 100644
index 00000000..c9dbeea1
--- /dev/null
+++ b/src/Helpers/Schedule/CalculatesTime.php
@@ -0,0 +1,24 @@
+ $times) {
+ $seconds += [60 * 60, 60][$key] * $times;
+ }
+
+ return $seconds;
+ }
+}
diff --git a/src/Helpers/Schedule/Conference.php b/src/Helpers/Schedule/Conference.php
new file mode 100644
index 00000000..0819d059
--- /dev/null
+++ b/src/Helpers/Schedule/Conference.php
@@ -0,0 +1,129 @@
+title = $title;
+ $this->acronym = $acronym;
+ $this->start = $start;
+ $this->end = $end;
+ $this->days = $days;
+ $this->timeslotDuration = $timeslotDuration;
+ $this->baseUrl = $baseUrl;
+ }
+
+ /**
+ * @return string
+ */
+ public function getTitle(): string
+ {
+ return $this->title;
+ }
+
+ /**
+ * @return string
+ */
+ public function getAcronym(): string
+ {
+ return $this->acronym;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getStart(): ?string
+ {
+ return $this->start;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getEnd(): ?string
+ {
+ return $this->end;
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getDays(): ?int
+ {
+ return $this->days;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getTimeslotDuration(): ?string
+ {
+ return $this->timeslotDuration;
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getTimeslotDurationSeconds(): ?int
+ {
+ $duration = $this->getTimeslotDuration();
+ if (!$duration) {
+ return null;
+ }
+
+ return $this->secondsFromTime($duration);
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getBaseUrl(): ?string
+ {
+ return $this->baseUrl;
+ }
+}
diff --git a/src/Helpers/Schedule/Day.php b/src/Helpers/Schedule/Day.php
new file mode 100644
index 00000000..03106e8f
--- /dev/null
+++ b/src/Helpers/Schedule/Day.php
@@ -0,0 +1,88 @@
+date = $date;
+ $this->start = $start;
+ $this->end = $end;
+ $this->index = $index;
+ $this->room = $rooms;
+ }
+
+ /**
+ * @return string
+ */
+ public function getDate(): string
+ {
+ return $this->date;
+ }
+
+ /**
+ * @return Carbon
+ */
+ public function getStart(): Carbon
+ {
+ return $this->start;
+ }
+
+ /**
+ * @return Carbon
+ */
+ public function getEnd(): Carbon
+ {
+ return $this->end;
+ }
+
+ /**
+ * @return int
+ */
+ public function getIndex(): int
+ {
+ return $this->index;
+ }
+
+ /**
+ * @return Room[]
+ */
+ public function getRoom(): array
+ {
+ return $this->room;
+ }
+}
diff --git a/src/Helpers/Schedule/Event.php b/src/Helpers/Schedule/Event.php
new file mode 100644
index 00000000..ab3b39a5
--- /dev/null
+++ b/src/Helpers/Schedule/Event.php
@@ -0,0 +1,345 @@
+ name */
+ protected $persons;
+
+ /** @var string|null two letter code */
+ protected $language;
+
+ /** @var string|null */
+ protected $description;
+
+ /** @var string|null license (and opt out in XML, null if not recorded, empty if no license defined) */
+ protected $recording;
+
+ /** @var array href => title */
+ protected $links;
+
+ /** @var array href => name */
+ protected $attachments;
+
+ /** @var string|null */
+ protected $url;
+
+ /** @var string|null */
+ protected $videoDownloadUrl;
+
+ /** @var Carbon Calculated */
+ protected $endDate;
+
+ /**
+ * Event constructor.
+ *
+ * @param string $guid
+ * @param int $id
+ * @param Room $room
+ * @param string $title
+ * @param string $subtitle
+ * @param string $type
+ * @param Carbon $date
+ * @param string $start
+ * @param string $duration
+ * @param string $abstract
+ * @param string $slug
+ * @param string $track
+ * @param string|null $logo
+ * @param string[] $persons
+ * @param string|null $language
+ * @param string|null $description
+ * @param string|null $recording license
+ * @param array $links
+ * @param array $attachments
+ * @param string|null $url
+ * @param string|null $videoDownloadUrl
+ */
+ public function __construct(
+ string $guid,
+ int $id,
+ Room $room,
+ string $title,
+ string $subtitle,
+ string $type,
+ Carbon $date,
+ string $start,
+ string $duration,
+ string $abstract,
+ string $slug,
+ string $track,
+ ?string $logo = null,
+ array $persons = [],
+ ?string $language = null,
+ ?string $description = null,
+ string $recording = '',
+ array $links = [],
+ array $attachments = [],
+ ?string $url = null,
+ ?string $videoDownloadUrl = null
+ ) {
+ $this->guid = $guid;
+ $this->id = $id;
+ $this->room = $room;
+ $this->title = $title;
+ $this->subtitle = $subtitle;
+ $this->type = $type;
+ $this->date = $date;
+ $this->start = $start;
+ $this->duration = $duration;
+ $this->abstract = $abstract;
+ $this->slug = $slug;
+ $this->track = $track;
+ $this->logo = $logo;
+ $this->persons = $persons;
+ $this->language = $language;
+ $this->description = $description;
+ $this->recording = $recording;
+ $this->links = $links;
+ $this->attachments = $attachments;
+ $this->url = $url;
+ $this->videoDownloadUrl = $videoDownloadUrl;
+
+ $this->endDate = $this->date
+ ->copy()
+ ->addSeconds($this->getDurationSeconds());
+ }
+
+ /**
+ * @return string
+ */
+ public function getGuid(): string
+ {
+ return $this->guid;
+ }
+
+ /**
+ * @return int
+ */
+ public function getId(): int
+ {
+ return $this->id;
+ }
+
+ /**
+ * @return Room
+ */
+ public function getRoom(): Room
+ {
+ return $this->room;
+ }
+
+ /**
+ * @return string
+ */
+ public function getTitle(): string
+ {
+ return $this->title;
+ }
+
+ /**
+ * @param string $title
+ */
+ public function setTitle(string $title): void
+ {
+ $this->title = $title;
+ }
+
+ /**
+ * @return string
+ */
+ public function getSubtitle(): string
+ {
+ return $this->subtitle;
+ }
+
+ /**
+ * @return string
+ */
+ public function getType(): string
+ {
+ return $this->type;
+ }
+
+ /**
+ * @return Carbon
+ */
+ public function getDate(): Carbon
+ {
+ return $this->date;
+ }
+
+ /**
+ * @return string
+ */
+ public function getStart(): string
+ {
+ return $this->start;
+ }
+
+ /**
+ * @return string
+ */
+ public function getDuration(): string
+ {
+ return $this->duration;
+ }
+
+ /**
+ * @return int
+ */
+ public function getDurationSeconds(): int
+ {
+ return $this->secondsFromTime($this->duration);
+ }
+
+ /**
+ * @return string
+ */
+ public function getAbstract(): string
+ {
+ return $this->abstract;
+ }
+
+ /**
+ * @return string
+ */
+ public function getSlug(): string
+ {
+ return $this->slug;
+ }
+
+ /**
+ * @return string
+ */
+ public function getTrack(): string
+ {
+ return $this->track;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getLogo(): ?string
+ {
+ return $this->logo;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getPersons(): array
+ {
+ return $this->persons;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getLanguage(): ?string
+ {
+ return $this->language;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getDescription(): ?string
+ {
+ return $this->description;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getRecording(): ?string
+ {
+ return $this->recording;
+ }
+
+ /**
+ * @return array
+ */
+ public function getLinks(): array
+ {
+ return $this->links;
+ }
+
+ /**
+ * @return array
+ */
+ public function getAttachments(): array
+ {
+ return $this->attachments;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getUrl(): ?string
+ {
+ return $this->url;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getVideoDownloadUrl(): ?string
+ {
+ return $this->videoDownloadUrl;
+ }
+
+ /**
+ * @return Carbon
+ */
+ public function getEndDate(): Carbon
+ {
+ return $this->endDate;
+ }
+}
diff --git a/src/Helpers/Schedule/Room.php b/src/Helpers/Schedule/Room.php
new file mode 100644
index 00000000..45a09f5f
--- /dev/null
+++ b/src/Helpers/Schedule/Room.php
@@ -0,0 +1,52 @@
+name = $name;
+ $this->event = $events;
+ }
+
+ /**
+ * @return string
+ */
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ /**
+ * @return Event[]
+ */
+ public function getEvent(): array
+ {
+ return $this->event;
+ }
+
+ /**
+ * @param Event[] $event
+ */
+ public function setEvent(array $event): void
+ {
+ $this->event = $event;
+ }
+}
diff --git a/src/Helpers/Schedule/Schedule.php b/src/Helpers/Schedule/Schedule.php
new file mode 100644
index 00000000..7150480c
--- /dev/null
+++ b/src/Helpers/Schedule/Schedule.php
@@ -0,0 +1,111 @@
+version = $version;
+ $this->conference = $conference;
+ $this->day = $days;
+ }
+
+ /**
+ * @return string
+ */
+ public function getVersion(): string
+ {
+ return $this->version;
+ }
+
+ /**
+ * @return Conference
+ */
+ public function getConference(): Conference
+ {
+ return $this->conference;
+ }
+
+ /**
+ * @return Day[]
+ */
+ public function getDay(): array
+ {
+ return $this->day;
+ }
+
+ /**
+ * @return Room[]
+ */
+ public function getRooms(): array
+ {
+ $rooms = [];
+ foreach ($this->day as $day) {
+ foreach ($day->getRoom() as $room) {
+ $name = $room->getName();
+ $rooms[$name] = $room;
+ }
+ }
+
+ return $rooms;
+ }
+
+
+ /**
+ * @return Carbon|null
+ */
+ public function getStartDateTime(): ?Carbon
+ {
+ $start = null;
+ foreach ($this->day as $day) {
+ $time = $day->getStart();
+ if ($time > $start && $start) {
+ continue;
+ }
+
+ $start = $time;
+ }
+
+ return $start;
+ }
+
+ /**
+ * @return Carbon|null
+ */
+ public function getEndDateTime(): ?Carbon
+ {
+ $end = null;
+ foreach ($this->day as $day) {
+ $time = $day->getEnd();
+ if ($time < $end && $end) {
+ continue;
+ }
+
+ $end = $time;
+ }
+
+ return $end;
+ }
+}
diff --git a/src/Helpers/Schedule/XmlParser.php b/src/Helpers/Schedule/XmlParser.php
new file mode 100644
index 00000000..1492aaca
--- /dev/null
+++ b/src/Helpers/Schedule/XmlParser.php
@@ -0,0 +1,172 @@
+scheduleXML = simplexml_load_string($xml);
+
+ if (!$this->scheduleXML) {
+ return false;
+ }
+
+ $this->parseXml();
+
+ return true;
+ }
+
+ /**
+ * Parse the predefined XML content
+ */
+ protected function parseXml(): void
+ {
+ $version = $this->getFirstXpathContent('version');
+ $conference = new Conference(
+ $this->getFirstXpathContent('conference/title'),
+ $this->getFirstXpathContent('conference/acronym'),
+ $this->getFirstXpathContent('conference/start'),
+ $this->getFirstXpathContent('conference/end'),
+ (int)$this->getFirstXpathContent('conference/days'),
+ $this->getFirstXpathContent('conference/timeslot_duration'),
+ $this->getFirstXpathContent('conference/base_url')
+ );
+ $days = [];
+
+ foreach ($this->scheduleXML->xpath('day') as $day) {
+ $rooms = [];
+
+ foreach ($day->xpath('room') as $roomElement) {
+ $room = new Room(
+ (string)$roomElement->attributes()['name']
+ );
+
+ $events = $this->parseEvents($roomElement->xpath('event'), $room);
+ $room->setEvent($events);
+ $rooms[] = $room;
+ }
+
+ $days[] = new Day(
+ (string)$day->attributes()['date'],
+ new Carbon($day->attributes()['start']),
+ new Carbon($day->attributes()['end']),
+ (int)$day->attributes()['index'],
+ $rooms
+ );
+ }
+
+ $this->schedule = new Schedule(
+ $version,
+ $conference,
+ $days
+ );
+ }
+
+ /**
+ * @param SimpleXMLElement[] $eventElements
+ * @param Room $room
+ * @return array
+ */
+ protected function parseEvents(array $eventElements, Room $room): array
+ {
+ $events = [];
+
+ foreach ($eventElements as $event) {
+ $persons = $this->getListFromSequence($event, 'persons', 'person', 'id');
+ $links = $this->getListFromSequence($event, 'links', 'link', 'href');
+ $attachments = $this->getListFromSequence($event, 'attachments', 'attachment', 'href');
+
+ $recording = '';
+ $recordingElement = $event->xpath('recording')[0];
+ if ($this->getFirstXpathContent('optout', $recordingElement) == 'false') {
+ $recording = $this->getFirstXpathContent('license', $recordingElement);
+ }
+
+ $events[] = new Event(
+ (string)$event->attributes()['guid'],
+ (int)$event->attributes()['id'],
+ $room,
+ $this->getFirstXpathContent('title', $event),
+ $this->getFirstXpathContent('subtitle', $event),
+ $this->getFirstXpathContent('type', $event),
+ new Carbon($this->getFirstXpathContent('date', $event)),
+ $this->getFirstXpathContent('start', $event),
+ $this->getFirstXpathContent('duration', $event),
+ $this->getFirstXpathContent('abstract', $event),
+ $this->getFirstXpathContent('slug', $event),
+ $this->getFirstXpathContent('track', $event),
+ $this->getFirstXpathContent('logo', $event) ?: null,
+ $persons,
+ $this->getFirstXpathContent('language', $event) ?: null,
+ $this->getFirstXpathContent('description', $event) ?: null,
+ $recording,
+ $links,
+ $attachments,
+ $this->getFirstXpathContent('url', $event) ?: null,
+ $this->getFirstXpathContent('video_download_url', $event) ?: null
+ );
+ }
+
+ return $events;
+ }
+
+ /**
+ * @param string $path
+ * @param SimpleXMLElement|null $xml
+ * @return string
+ */
+ protected function getFirstXpathContent(string $path, ?SimpleXMLElement $xml = null): string
+ {
+ $element = ($xml ?: $this->scheduleXML)->xpath($path);
+
+ return $element ? (string)$element[0] : '';
+ }
+
+ /**
+ * Resolves a list from a sequence of elements
+ *
+ * @param SimpleXMLElement $element
+ * @param string $firstElement
+ * @param string $secondElement
+ * @param string $idAttribute
+ * @return array
+ */
+ protected function getListFromSequence(
+ SimpleXMLElement $element,
+ string $firstElement,
+ string $secondElement,
+ string $idAttribute
+ ): array {
+ $items = [];
+
+ foreach ($element->xpath($firstElement)[0]->xpath($secondElement) as $item) {
+ $items[(string)$item->attributes()[$idAttribute]] = (string)$item;
+ }
+
+ return $items;
+ }
+
+ /**
+ * @return Schedule
+ */
+ public function getSchedule(): Schedule
+ {
+ return $this->schedule;
+ }
+}
diff --git a/src/Http/HttpClientServiceProvider.php b/src/Http/HttpClientServiceProvider.php
new file mode 100644
index 00000000..113af713
--- /dev/null
+++ b/src/Http/HttpClientServiceProvider.php
@@ -0,0 +1,25 @@
+app->when(GuzzleClient::class)
+ ->needs('$config')
+ ->give(
+ function () {
+ return [
+ // No exception on >= 400 responses
+ 'http_errors' => false,
+ // Wait max n seconds for a response
+ 'timeout' => 2.0,
+ ];
+ }
+ );
+ }
+}
diff --git a/src/Http/RedirectServiceProvider.php b/src/Http/RedirectServiceProvider.php
new file mode 100644
index 00000000..70238d91
--- /dev/null
+++ b/src/Http/RedirectServiceProvider.php
@@ -0,0 +1,13 @@
+app->bind('redirect', Redirector::class);
+ }
+}
diff --git a/src/Http/Redirector.php b/src/Http/Redirector.php
new file mode 100644
index 00000000..4149a8ec
--- /dev/null
+++ b/src/Http/Redirector.php
@@ -0,0 +1,55 @@
+request = $request;
+ $this->response = $response;
+ }
+
+ /**
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @return Response
+ */
+ public function to(string $path, int $status = 302, array $headers = []): Response
+ {
+ return $this->response->redirectTo($path, $status, $headers);
+ }
+
+ /**
+ * @param int $status
+ * @param array $headers
+ * @return Response
+ */
+ public function back(int $status = 302, array $headers = []): Response
+ {
+ return $this->to($this->getPreviousUrl(), $status, $headers);
+ }
+
+ /**
+ * @return string
+ */
+ protected function getPreviousUrl(): string
+ {
+ if ($header = $this->request->getHeader('referer')) {
+ return array_pop($header);
+ }
+
+ return '/';
+ }
+}
diff --git a/src/Http/Response.php b/src/Http/Response.php
index a6b4ab74..43bcb5d8 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -6,27 +6,37 @@ use Engelsystem\Renderer\Renderer;
use InvalidArgumentException;
use Psr\Http\Message\ResponseInterface;
use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
class Response extends SymfonyResponse implements ResponseInterface
{
use MessageTrait;
+ /**
+ * @var SessionInterface
+ */
+ protected $session;
+
/** @var Renderer */
protected $renderer;
/**
- * @param string $content
- * @param int $status
- * @param array $headers
- * @param Renderer $renderer
+ * @param string $content
+ * @param int $status
+ * @param array $headers
+ * @param Renderer $renderer
+ * @param SessionInterface $session
*/
public function __construct(
$content = '',
int $status = 200,
array $headers = [],
- Renderer $renderer = null
+ Renderer $renderer = null,
+ SessionInterface $session = null
) {
$this->renderer = $renderer;
+ $this->session = $session;
+
parent::__construct($content, $status, $headers);
}
@@ -155,4 +165,44 @@ class Response extends SymfonyResponse implements ResponseInterface
{
$this->renderer = $renderer;
}
+
+ /**
+ * Sets a session attribute (which is mutable)
+ *
+ * @param string $key
+ * @param mixed|mixed[] $value
+ * @return Response
+ */
+ public function with(string $key, $value)
+ {
+ if (!$this->session instanceof SessionInterface) {
+ throw new InvalidArgumentException('Session not defined');
+ }
+
+ $data = $this->session->get($key);
+ if (is_array($data) && is_array($value)) {
+ $value = array_merge_recursive($data, $value);
+ }
+
+ $this->session->set($key, $value);
+
+ return $this;
+ }
+
+ /**
+ * Sets form data to the mutable session
+ *
+ * @param array $input
+ * @return Response
+ */
+ public function withInput(array $input)
+ {
+ if (!$this->session instanceof SessionInterface) {
+ throw new InvalidArgumentException('Session not defined');
+ }
+
+ $this->session->set('form-data', $input);
+
+ return $this;
+ }
}
diff --git a/src/Middleware/ErrorHandler.php b/src/Middleware/ErrorHandler.php
index 46e6e5a8..85f315d4 100644
--- a/src/Middleware/ErrorHandler.php
+++ b/src/Middleware/ErrorHandler.php
@@ -63,17 +63,11 @@ class ErrorHandler implements MiddlewareInterface
} catch (HttpException $e) {
$response = $this->createResponse($e->getMessage(), $e->getStatusCode(), $e->getHeaders());
} catch (ValidationException $e) {
- $response = $this->createResponse('', 302, ['Location' => $this->getPreviousUrl($request)]);
+ $response = $this->redirectBack();
+ $response->with('errors', ['validation' => $e->getValidator()->getErrors()]);
if ($request instanceof Request) {
- $session = $request->getSession();
- $errors = array_merge_recursive(
- $session->get('errors', []),
- ['validation' => $e->getValidator()->getErrors()]
- );
- $session->set('errors', $errors);
-
- $session->set('form-data', Arr::except($request->request->all(), $this->formIgnore));
+ $response->withInput(Arr::except($request->request->all(), $this->formIgnore));
}
}
@@ -140,15 +134,12 @@ class ErrorHandler implements MiddlewareInterface
}
/**
- * @param ServerRequestInterface $request
- * @return string
+ * Create a redirect back response
+ *
+ * @return Response
*/
- protected function getPreviousUrl(ServerRequestInterface $request)
+ protected function redirectBack()
{
- if ($header = $request->getHeader('referer')) {
- return array_pop($header);
- }
-
- return '/';
+ return back();
}
}
diff --git a/src/Middleware/LegacyMiddleware.php b/src/Middleware/LegacyMiddleware.php
index 8a0ff002..5e08858d 100644
--- a/src/Middleware/LegacyMiddleware.php
+++ b/src/Middleware/LegacyMiddleware.php
@@ -205,10 +205,6 @@ class LegacyMiddleware implements MiddlewareInterface
$title = admin_groups_title();
$content = admin_groups();
return [$title, $content];
- case 'admin_import':
- $title = admin_import_title();
- $content = admin_import();
- return [$title, $content];
case 'admin_shifts':
$title = admin_shifts_title();
$content = admin_shifts();
@@ -219,7 +215,7 @@ class LegacyMiddleware implements MiddlewareInterface
return [$title, $content];
}
- redirect(page_link_to('login'));
+ throw_redirect(page_link_to('login'));
return [];
}
@@ -239,9 +235,15 @@ class LegacyMiddleware implements MiddlewareInterface
return response($content, (int)$page);
}
- return response(view('layouts/app', [
- 'title' => $title,
- 'content' => msg() . $content,
- ]), 200);
+ return response(
+ view(
+ 'layouts/app',
+ [
+ 'title' => $title,
+ 'content' => msg() . $content,
+ ]
+ ),
+ 200
+ );
}
}
diff --git a/src/Models/Shifts/Schedule.php b/src/Models/Shifts/Schedule.php
new file mode 100644
index 00000000..c1eb2d9e
--- /dev/null
+++ b/src/Models/Shifts/Schedule.php
@@ -0,0 +1,31 @@
+hasMany(ScheduleShift::class);
+ }
+}
diff --git a/src/Models/Shifts/ScheduleShift.php b/src/Models/Shifts/ScheduleShift.php
new file mode 100644
index 00000000..368c60b1
--- /dev/null
+++ b/src/Models/Shifts/ScheduleShift.php
@@ -0,0 +1,38 @@
+belongsTo(Schedule::class);
+ }
+}
diff --git a/src/helpers.php b/src/helpers.php
index de140c4e..7cb17ea9 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -4,6 +4,7 @@ use Engelsystem\Application;
use Engelsystem\Config\Config;
use Engelsystem\Helpers\Authenticator;
use Engelsystem\Helpers\Translation\Translator;
+use Engelsystem\Http\Redirector;
use Engelsystem\Http\Request;
use Engelsystem\Http\Response;
use Engelsystem\Http\UrlGeneratorInterface;
@@ -28,7 +29,7 @@ function app($id = null)
/**
* @return Authenticator
*/
-function auth()
+function auth(): Authenticator
{
return app('authenticator');
}
@@ -37,11 +38,24 @@ function auth()
* @param string $path
* @return string
*/
-function base_path($path = '')
+function base_path($path = ''): string
{
return app('path') . (empty($path) ? '' : DIRECTORY_SEPARATOR . $path);
}
+/**
+ * @param int $status
+ * @param array $headers
+ * @return Response
+ */
+function back($status = 302, $headers = []): Response
+{
+ /** @var Redirector $redirect */
+ $redirect = app('redirect');
+
+ return $redirect->back($status, $headers);
+}
+
/**
* Get or set config values
*
@@ -70,11 +84,25 @@ function config($key = null, $default = null)
* @param string $path
* @return string
*/
-function config_path($path = '')
+function config_path($path = ''): string
{
return app('path.config') . (empty($path) ? '' : DIRECTORY_SEPARATOR . $path);
}
+/**
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @return Response
+ */
+function redirect(string $path, $status = 302, $headers = []): Response
+{
+ /** @var Redirector $redirect */
+ $redirect = app('redirect');
+
+ return $redirect->to($path, $status, $headers);
+}
+
/**
* @param string $key
* @param mixed $default
@@ -97,7 +125,7 @@ function request($key = null, $default = null)
* @param array $headers
* @return Response
*/
-function response($content = '', $status = 200, $headers = [])
+function response($content = '', $status = 200, $headers = []): Response
{
/** @var Response $response */
$response = app('psr7.response');
@@ -155,7 +183,7 @@ function trans($key = null, $replace = [])
* @param array $replace
* @return string
*/
-function __($key, $replace = [])
+function __($key, $replace = []): string
{
/** @var Translator $translator */
$translator = app('translator');
@@ -172,7 +200,7 @@ function __($key, $replace = [])
* @param array $replace
* @return string
*/
-function _e($key, $keyPlural, $number, $replace = [])
+function _e($key, $keyPlural, $number, $replace = []): string
{
/** @var Translator $translator */
$translator = app('translator');
diff --git a/tests/Feature/Model/RoomModelTest.php b/tests/Feature/Model/RoomModelTest.php
index 9908082a..3ed4bcd2 100644
--- a/tests/Feature/Model/RoomModelTest.php
+++ b/tests/Feature/Model/RoomModelTest.php
@@ -13,7 +13,7 @@ class RoomModelTest extends TestCase
*/
public function createRoom()
{
- $this->room_id = Room_create('test', false, null, null);
+ $this->room_id = Room_create('test', null, null);
}
/**
diff --git a/tests/Unit/HasDatabase.php b/tests/Unit/HasDatabase.php
index dbaa253e..3fe29e4a 100644
--- a/tests/Unit/HasDatabase.php
+++ b/tests/Unit/HasDatabase.php
@@ -36,14 +36,17 @@ trait HasDatabase
$this->database
->getConnection()
->table('migrations')
- ->insert([
- ['migration' => '2018_01_01_000001_import_install_sql'],
- ['migration' => '2018_01_01_000002_import_update_sql'],
- ['migration' => '2018_01_01_000003_fix_old_tables'],
- ['migration' => '2018_01_01_000004_cleanup_group_privileges'],
- ['migration' => '2018_01_01_000005_add_angel_supporter_permissions'],
- ['migration' => '2018_12_27_000000_fix_missing_arrival_dates'],
- ]);
+ ->insert(
+ [
+ ['migration' => '2018_01_01_000001_import_install_sql'],
+ ['migration' => '2018_01_01_000002_import_update_sql'],
+ ['migration' => '2018_01_01_000003_fix_old_tables'],
+ ['migration' => '2018_01_01_000004_cleanup_group_privileges'],
+ ['migration' => '2018_01_01_000005_add_angel_supporter_permissions'],
+ ['migration' => '2018_12_27_000000_fix_missing_arrival_dates'],
+ ['migration' => '2019_09_07_000000_migrate_admin_schedule_permissions'],
+ ]
+ );
$migration->run(__DIR__ . '/../../db/migrations');
}
diff --git a/tests/Unit/Helpers/Schedule/Assets/schedule.xml b/tests/Unit/Helpers/Schedule/Assets/schedule.xml
new file mode 100644
index 00000000..45aaaf35
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/Assets/schedule.xml
@@ -0,0 +1,46 @@
+
+
+ Some version string
+
+ Test Event
+ Test1
+ 2042-01-01
+ 2042-01-01
+ 1
+ 00:15
+ https://foo.bar/baz/schedule/
+
+
+
+
+ 2042-01-01T12:30:00+02:00
+ Foo Bar Test
+ Some sub
+ 12:30
+ 00:30
+ Rooming
+ foo-bar-test
+
+ WTFPL
+ false
+
+
+ Talk
+ de
+ Foo bar is da best
+ Any describing stuff?
+ https://foo.bar/baz/schedule/ipsum
+ https://lorem.ipsum/foo/bar.png
+
+ Some Person
+
+
+ Some Foo Bar
+
+
+ A PDF File
+
+
+
+
+
diff --git a/tests/Unit/Helpers/Schedule/CalculatesTimeTest.php b/tests/Unit/Helpers/Schedule/CalculatesTimeTest.php
new file mode 100644
index 00000000..8f0123e9
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/CalculatesTimeTest.php
@@ -0,0 +1,33 @@
+secondsFromTime($time);
+ }
+ };
+
+ $this->assertEquals(0, $calc->calc('0:00'));
+ $this->assertEquals(60, $calc->calc('0:01'));
+ $this->assertEquals(60 * 60, $calc->calc('01:00'));
+ $this->assertEquals(60 * 60 * 10 + 60 * 11, $calc->calc('10:11'));
+ }
+}
diff --git a/tests/Unit/Helpers/Schedule/ConferenceTest.php b/tests/Unit/Helpers/Schedule/ConferenceTest.php
new file mode 100644
index 00000000..959e272b
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/ConferenceTest.php
@@ -0,0 +1,49 @@
+assertEquals('Doing stuff', $conference->getTitle());
+ $this->assertEquals('DS', $conference->getAcronym());
+ $this->assertNull($conference->getStart());
+ $this->assertNull($conference->getEnd());
+ $this->assertNull($conference->getDays());
+ $this->assertNull($conference->getTimeslotDuration());
+ $this->assertNull($conference->getTimeslotDurationSeconds());
+ $this->assertNull($conference->getBaseUrl());
+
+ $conference = new Conference(
+ 'Doing stuff',
+ 'DS',
+ '2042-01-01',
+ '2042-01-10',
+ 10,
+ '00:10',
+ 'https://foo.bar/schedule'
+ );
+ $this->assertEquals('2042-01-01', $conference->getStart());
+ $this->assertEquals('2042-01-10', $conference->getEnd());
+ $this->assertEquals(10, $conference->getDays());
+ $this->assertEquals('00:10', $conference->getTimeslotDuration());
+ $this->assertEquals(60 * 10, $conference->getTimeslotDurationSeconds());
+ $this->assertEquals('https://foo.bar/schedule', $conference->getBaseUrl());
+ }
+}
diff --git a/tests/Unit/Helpers/Schedule/DayTest.php b/tests/Unit/Helpers/Schedule/DayTest.php
new file mode 100644
index 00000000..65704181
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/DayTest.php
@@ -0,0 +1,47 @@
+assertEquals('2000-01-01', $day->getDate());
+ $this->assertEquals('2000-01-01T03:00:00+01:00', $day->getStart()->format(Carbon::RFC3339));
+ $this->assertEquals('2000-01-02T05:59:00+00:00', $day->getEnd()->format(Carbon::RFC3339));
+ $this->assertEquals(1, $day->getIndex());
+ $this->assertEquals([], $day->getRoom());
+
+ $rooms = [
+ new Room('Foo'),
+ new Room('Bar'),
+ ];
+ $day = new Day(
+ '2001-01-01',
+ new Carbon('2001-01-01T03:00:00+01:00'),
+ new Carbon('2001-01-02T05:59:00+00:00'),
+ 1,
+ $rooms
+ );
+ $this->assertEquals($rooms, $day->getRoom());
+ }
+}
diff --git a/tests/Unit/Helpers/Schedule/EventTest.php b/tests/Unit/Helpers/Schedule/EventTest.php
new file mode 100644
index 00000000..d9706b13
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/EventTest.php
@@ -0,0 +1,149 @@
+assertEquals('0-1-2-3', $event->getGuid());
+ $this->assertEquals(1, $event->getId());
+ $this->assertEquals($room, $event->getRoom());
+ $this->assertEquals('Some stuff', $event->getTitle());
+ $this->assertEquals('sub stuff', $event->getSubtitle());
+ $this->assertEquals('Talk', $event->getType());
+ $this->assertEquals($date, $event->getDate());
+ $this->assertEquals('19:30:00', $event->getStart());
+ $this->assertEquals('00:50', $event->getDuration());
+ $this->assertEquals('Doing stuff is hard, plz try again', $event->getAbstract());
+ $this->assertEquals('1-some-stuff', $event->getSlug());
+ $this->assertEquals('Security', $event->getTrack());
+ $this->assertNull($event->getLogo());
+ $this->assertEquals([], $event->getPersons());
+ $this->assertNull($event->getLanguage());
+ $this->assertNull($event->getDescription());
+ $this->assertEquals('', $event->getRecording());
+ $this->assertEquals([], $event->getLinks());
+ $this->assertEquals([], $event->getAttachments());
+ $this->assertNull($event->getUrl());
+ $this->assertNull($event->getVideoDownloadUrl());
+ $this->assertEquals('2020-12-28T20:20:00+00:00', $event->getEndDate()->format(Carbon::RFC3339));
+ }
+
+ /**
+ * @covers \Engelsystem\Helpers\Schedule\Event::__construct
+ * @covers \Engelsystem\Helpers\Schedule\Event::getGuid
+ * @covers \Engelsystem\Helpers\Schedule\Event::getId
+ * @covers \Engelsystem\Helpers\Schedule\Event::getRoom
+ * @covers \Engelsystem\Helpers\Schedule\Event::getTitle
+ * @covers \Engelsystem\Helpers\Schedule\Event::setTitle
+ * @covers \Engelsystem\Helpers\Schedule\Event::getSubtitle
+ * @covers \Engelsystem\Helpers\Schedule\Event::getType
+ * @covers \Engelsystem\Helpers\Schedule\Event::getDate
+ * @covers \Engelsystem\Helpers\Schedule\Event::getStart
+ * @covers \Engelsystem\Helpers\Schedule\Event::getDuration
+ * @covers \Engelsystem\Helpers\Schedule\Event::getDurationSeconds
+ * @covers \Engelsystem\Helpers\Schedule\Event::getAbstract
+ * @covers \Engelsystem\Helpers\Schedule\Event::getSlug
+ * @covers \Engelsystem\Helpers\Schedule\Event::getTrack
+ * @covers \Engelsystem\Helpers\Schedule\Event::getLogo
+ * @covers \Engelsystem\Helpers\Schedule\Event::getPersons
+ * @covers \Engelsystem\Helpers\Schedule\Event::getLanguage
+ * @covers \Engelsystem\Helpers\Schedule\Event::getDescription
+ * @covers \Engelsystem\Helpers\Schedule\Event::getRecording
+ * @covers \Engelsystem\Helpers\Schedule\Event::getLinks
+ * @covers \Engelsystem\Helpers\Schedule\Event::getAttachments
+ * @covers \Engelsystem\Helpers\Schedule\Event::getUrl
+ * @covers \Engelsystem\Helpers\Schedule\Event::getVideoDownloadUrl
+ */
+ public function testCreateNotDefault()
+ {
+ $persons = [1337 => 'Some Person'];
+ $links = ['https://foo.bar' => 'Foo Bar'];
+ $attachments = ['/files/foo.pdf' => 'Suspicious PDF'];
+ $event = new Event(
+ '3-2-1-0',
+ 2,
+ new Room('Bar'),
+ 'Lorem',
+ 'Ipsum',
+ 'Workshop',
+ new Carbon('2021-01-01T00:00:00+00:00'),
+ '00:00:00',
+ '00:30',
+ 'Lorem ipsum dolor sit amet',
+ '2-lorem',
+ 'DevOps',
+ '/foo/bar.png',
+ $persons,
+ 'de',
+ 'Foo bar is awesome! & That\'s why...',
+ 'CC BY SA',
+ $links,
+ $attachments,
+ 'https://foo.bar/2-lorem',
+ 'https://videos.orem.ipsum/2-lorem.mp4'
+ );
+
+ $this->assertEquals('/foo/bar.png', $event->getLogo());
+ $this->assertEquals($persons, $event->getPersons());
+ $this->assertEquals('de', $event->getLanguage());
+ $this->assertEquals('Foo bar is awesome! & That\'s why...', $event->getDescription());
+ $this->assertEquals('CC BY SA', $event->getRecording());
+ $this->assertEquals($links, $event->getLinks());
+ $this->assertEquals($attachments, $event->getAttachments());
+ $this->assertEquals('https://foo.bar/2-lorem', $event->getUrl());
+ $this->assertEquals('https://videos.orem.ipsum/2-lorem.mp4', $event->getVideoDownloadUrl());
+
+ $event->setTitle('Event title');
+ $this->assertEquals('Event title', $event->getTitle());
+ }
+}
diff --git a/tests/Unit/Helpers/Schedule/RoomTest.php b/tests/Unit/Helpers/Schedule/RoomTest.php
new file mode 100644
index 00000000..8b9b600a
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/RoomTest.php
@@ -0,0 +1,31 @@
+assertEquals('Test', $room->getName());
+ $this->assertEquals([], $room->getEvent());
+
+ $events = [$this->createMock(Event::class), $this->createMock(Event::class)];
+ $events2 = [$this->createMock(Event::class)];
+ $room = new Room('Test2', $events);
+ $this->assertEquals($events, $room->getEvent());
+
+ $room->setEvent($events2);
+ $this->assertEquals($events2, $room->getEvent());
+ }
+}
diff --git a/tests/Unit/Helpers/Schedule/ScheduleTest.php b/tests/Unit/Helpers/Schedule/ScheduleTest.php
new file mode 100644
index 00000000..6a3634cf
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/ScheduleTest.php
@@ -0,0 +1,112 @@
+createMock(Day::class)];
+ $schedule = new Schedule('Foo\'ing stuff 1.0', $conference, $days);
+
+ $this->assertEquals('Foo\'ing stuff 1.0', $schedule->getVersion());
+ $this->assertEquals($conference, $schedule->getConference());
+ $this->assertEquals($days, $schedule->getDay());
+ }
+
+ /**
+ * @covers \Engelsystem\Helpers\Schedule\Schedule::getRooms
+ */
+ public function testGetRooms()
+ {
+ $conference = new Conference('Test', 'T');
+ $room1 = new Room('Test 1');
+ $room2 = new Room('Test 2');
+ $room3 = new Room('Test 3');
+ $days = [
+ new Day(
+ '2042-01-01',
+ new Carbon('2042-01-01T00:00:00+00:00'),
+ new Carbon('2042-01-01T23:59:00+00:00'),
+ 1,
+ [$room1, $room2]
+ ),
+ new Day(
+ '2042-01-02',
+ new Carbon('2042-02-01T00:00:00+00:00'),
+ new Carbon('2042-02-01T23:59:00+00:00'),
+ 2,
+ [new Room('Test 2'), $room3]
+ ),
+ ];
+ $schedule = new Schedule('Lorem 1.3.3.7', $conference, $days);
+
+ $this->assertEquals(['Test 1' => $room1, 'Test 2' => $room2, 'Test 3' => $room3], $schedule->getRooms());
+
+ $schedule = new Schedule('Lorem 1.3.3.0', $conference, []);
+ $this->assertEquals([], $schedule->getRooms());
+ }
+
+ /**
+ * @covers \Engelsystem\Helpers\Schedule\Schedule::getStartDateTime
+ * @covers \Engelsystem\Helpers\Schedule\Schedule::getEndDateTime
+ */
+ public function testGetDateTimes()
+ {
+ $conference = new Conference('Some Conference', 'SC');
+ $days = [
+ new Day(
+ '2042-01-02',
+ new Carbon('2042-01-02T00:00:00+00:00'),
+ new Carbon('2042-01-02T23:59:00+00:00'),
+ 2
+ ),
+ new Day(
+ '2042-01-01',
+ new Carbon('2042-01-01T00:00:00+00:00'),
+ new Carbon('2042-01-01T23:59:00+00:00'),
+ 1
+ ),
+ new Day(
+ '2042-01-04',
+ new Carbon('2042-01-04T00:00:00+00:00'),
+ new Carbon('2042-01-04T23:59:00+00:00'),
+ 3
+ ),
+ ];
+ $schedule = new Schedule('Ipsum tester', $conference, $days);
+
+ $this->assertEquals('2042-01-01T00:00:00+00:00', $schedule->getStartDateTime()->format(Carbon::RFC3339));
+ $this->assertEquals('2042-01-04T23:59:00+00:00', $schedule->getEndDateTime()->format(Carbon::RFC3339));
+
+ $schedule = new Schedule('Ipsum old', $conference, []);
+ $this->assertNull($schedule->getStartDateTime());
+ $this->assertNull($schedule->getEndDateTime());
+ }
+
+ /**
+ * Prepare test
+ */
+ protected function setUp(): void
+ {
+ parent::setUp();
+ $this->initDatabase();
+ }
+}
diff --git a/tests/Unit/Helpers/Schedule/XmlParserTest.php b/tests/Unit/Helpers/Schedule/XmlParserTest.php
new file mode 100644
index 00000000..023e9c7d
--- /dev/null
+++ b/tests/Unit/Helpers/Schedule/XmlParserTest.php
@@ -0,0 +1,54 @@
+assertFalse($parser->load('foo'));
+ $this->assertTrue($parser->load(file_get_contents(__DIR__ . '/Assets/schedule.xml')));
+
+ $schedule = $parser->getSchedule();
+ $this->assertEquals('Some version string', $schedule->getVersion());
+ $this->assertEquals('Test Event', $schedule->getConference()->getTitle());
+
+ /** @var Room $room */
+ $room = Arr::first($schedule->getRooms());
+ $this->assertEquals('Rooming', $room->getName());
+
+ /** @var Day $day */
+ $day = Arr::first($schedule->getDay());
+ $this->assertEquals('2042-01-01', $day->getDate());
+ $this->assertEquals(1, $day->getIndex());
+
+ /** @var Room $room */
+ $room = Arr::first($day->getRoom());
+ /** @var Event $event */
+ $event = Arr::first($room->getEvent());
+
+ $this->assertEquals('Foo Bar Test', $event->getTitle());
+ $this->assertEquals('WTFPL', $event->getRecording());
+ $this->assertEquals('de', $event->getLanguage());
+ $this->assertEquals('12:30', $event->getStart());
+ $this->assertEquals([1234 => 'Some Person'], $event->getPersons());
+ }
+}
diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
index 09362a90..710deff5 100644
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@@ -7,6 +7,7 @@ use Engelsystem\Config\Config;
use Engelsystem\Container\Container;
use Engelsystem\Helpers\Authenticator;
use Engelsystem\Helpers\Translation\Translator;
+use Engelsystem\Http\Redirector;
use Engelsystem\Http\Request;
use Engelsystem\Http\Response;
use Engelsystem\Http\UrlGeneratorInterface;
@@ -98,6 +99,29 @@ class HelpersTest extends TestCase
$this->assertEquals(['user' => 'FooBar'], config('mail'));
}
+ /**
+ * @covers \back
+ */
+ public function testBack()
+ {
+ $response = new Response();
+ /** @var Redirector|MockObject $redirect */
+ $redirect = $this->createMock(Redirector::class);
+ $redirect->expects($this->exactly(2))
+ ->method('back')
+ ->withConsecutive([302, []], [303, ['test' => 'ing']])
+ ->willReturn($response);
+
+ $app = new Application();
+ $app->instance('redirect', $redirect);
+
+ $return = back();
+ $this->assertEquals($response, $return);
+
+ $return = back(303, ['test' => 'ing']);
+ $this->assertEquals($response, $return);
+ }
+
/**
* @covers \config_path
*/
@@ -117,6 +141,29 @@ class HelpersTest extends TestCase
$this->assertEquals('/foo/conf/bar.php', config_path('bar.php'));
}
+ /**
+ * @covers \redirect
+ */
+ public function testRedirect()
+ {
+ $response = new Response();
+ /** @var Redirector|MockObject $redirect */
+ $redirect = $this->createMock(Redirector::class);
+ $redirect->expects($this->exactly(2))
+ ->method('to')
+ ->withConsecutive(['/lorem', 302, []], ['/ipsum', 303, ['test' => 'er']])
+ ->willReturn($response);
+
+ $app = new Application();
+ $app->instance('redirect', $redirect);
+
+ $return = redirect('/lorem');
+ $this->assertEquals($response, $return);
+
+ $return = redirect('/ipsum', 303, ['test' => 'er']);
+ $this->assertEquals($response, $return);
+ }
+
/**
* @covers \request
*/
diff --git a/tests/Unit/Http/HttpClientServiceProviderTest.php b/tests/Unit/Http/HttpClientServiceProviderTest.php
new file mode 100644
index 00000000..7dfc0a3e
--- /dev/null
+++ b/tests/Unit/Http/HttpClientServiceProviderTest.php
@@ -0,0 +1,29 @@
+register();
+
+ /** @var GuzzleClient $guzzle */
+ $guzzle = $app->make(GuzzleClient::class);
+ $config = $guzzle->getConfig();
+
+ $this->assertFalse($config['http_errors']);
+ $this->assertArrayHasKey('timeout', $config);
+ }
+}
diff --git a/tests/Unit/Http/RedirectServiceProviderTest.php b/tests/Unit/Http/RedirectServiceProviderTest.php
new file mode 100644
index 00000000..9c2a07fc
--- /dev/null
+++ b/tests/Unit/Http/RedirectServiceProviderTest.php
@@ -0,0 +1,23 @@
+register();
+
+ $this->assertTrue($app->has('redirect'));
+ }
+}
diff --git a/tests/Unit/Http/RedirectorTest.php b/tests/Unit/Http/RedirectorTest.php
new file mode 100644
index 00000000..300b0180
--- /dev/null
+++ b/tests/Unit/Http/RedirectorTest.php
@@ -0,0 +1,53 @@
+to('/test');
+ $this->assertEquals(['/test'], $return->getHeader('location'));
+ $this->assertEquals(302, $return->getStatusCode());
+
+ $return = $redirector->to('/foo', 303, ['test' => 'data']);
+ $this->assertEquals(['/foo'], $return->getHeader('location'));
+ $this->assertEquals(303, $return->getStatusCode());
+ $this->assertEquals(['data'], $return->getHeader('test'));
+ }
+
+ /**
+ * @covers \Engelsystem\Http\Redirector::back
+ * @covers \Engelsystem\Http\Redirector::getPreviousUrl
+ */
+ public function testBack()
+ {
+ $request = new Request();
+ $response = new Response();
+ $redirector = new Redirector($request, $response);
+
+ $return = $redirector->back();
+ $this->assertEquals(['/'], $return->getHeader('location'));
+ $this->assertEquals(302, $return->getStatusCode());
+
+ $request = $request->withHeader('referer', '/old-page');
+ $redirector = new Redirector($request, $response);
+ $return = $redirector->back(303, ['foo' => 'bar']);
+ $this->assertEquals(303, $return->getStatusCode());
+ $this->assertEquals(['/old-page'], $return->getHeader('location'));
+ $this->assertEquals(['bar'], $return->getHeader('foo'));
+ }
+}
diff --git a/tests/Unit/Http/ResponseTest.php b/tests/Unit/Http/ResponseTest.php
index b8e6e527..56d8410f 100644
--- a/tests/Unit/Http/ResponseTest.php
+++ b/tests/Unit/Http/ResponseTest.php
@@ -10,6 +10,8 @@ use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\ResponseInterface;
use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
class ResponseTest extends TestCase
{
@@ -116,4 +118,59 @@ class ResponseTest extends TestCase
$newResponse->getHeaders()
);
}
+
+ /**
+ * @covers \Engelsystem\Http\Response::with
+ */
+ public function testWith()
+ {
+ $session = new Session(new MockArraySessionStorage());
+ $response = new Response('', 200, [], null, $session);
+
+ $response->with('foo', 'bar');
+ $this->assertEquals('bar', $session->get('foo'));
+
+ $response->with('lorem', ['ipsum', 'dolor' => ['foo' => 'bar']]);
+ $this->assertEquals(['ipsum', 'dolor' => ['foo' => 'bar']], $session->get('lorem'));
+
+ $response->with('lorem', ['dolor' => ['test' => 'er']]);
+ $this->assertEquals(['ipsum', 'dolor' => ['foo' => 'bar', 'test' => 'er']], $session->get('lorem'));
+ }
+
+ /**
+ * @covers \Engelsystem\Http\Response::with
+ */
+ public function testWithNoSession()
+ {
+ $this->expectException(InvalidArgumentException::class);
+
+ $response = new Response();
+ $response->with('foo', 'bar');
+ }
+
+ /**
+ * @covers \Engelsystem\Http\Response::withInput
+ */
+ public function testWithInput()
+ {
+ $session = new Session(new MockArraySessionStorage());
+ $response = new Response('', 200, [], null, $session);
+
+ $response->withInput(['some' => 'value']);
+ $this->assertEquals(['some' => 'value'], $session->get('form-data'));
+
+ $response->withInput(['lorem' => 'ipsum']);
+ $this->assertEquals(['lorem' => 'ipsum'], $session->get('form-data'));
+ }
+
+ /**
+ * @covers \Engelsystem\Http\Response::withInput
+ */
+ public function testWithInputNoSession()
+ {
+ $this->expectException(InvalidArgumentException::class);
+
+ $response = new Response();
+ $response->withInput(['some' => 'value']);
+ }
}
diff --git a/tests/Unit/Middleware/ErrorHandlerTest.php b/tests/Unit/Middleware/ErrorHandlerTest.php
index ef2f7be0..91b59507 100644
--- a/tests/Unit/Middleware/ErrorHandlerTest.php
+++ b/tests/Unit/Middleware/ErrorHandlerTest.php
@@ -6,6 +6,7 @@ use Engelsystem\Application;
use Engelsystem\Http\Exceptions\HttpException;
use Engelsystem\Http\Exceptions\ValidationException;
use Engelsystem\Http\Psr7ServiceProvider;
+use Engelsystem\Http\RedirectServiceProvider;
use Engelsystem\Http\Request;
use Engelsystem\Http\Response;
use Engelsystem\Http\ResponseServiceProvider;
@@ -18,6 +19,7 @@ use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;
use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Twig\Loader\LoaderInterface as TwigLoader;
@@ -155,7 +157,7 @@ class ErrorHandlerTest extends TestCase
/**
* @covers \Engelsystem\Middleware\ErrorHandler::process
- * @covers \Engelsystem\Middleware\ErrorHandler::getPreviousUrl
+ * @covers \Engelsystem\Middleware\ErrorHandler::redirectBack
*/
public function testProcessValidationException()
{
@@ -185,11 +187,13 @@ class ErrorHandlerTest extends TestCase
/** @var Application $app */
$app = app();
+ $app->instance(Session::class, $session);
+ $app->bind(SessionInterface::class, Session::class);
(new ResponseServiceProvider($app))->register();
(new Psr7ServiceProvider($app))->register();
+ (new RedirectServiceProvider($app))->register();
$errorHandler = new ErrorHandler($twigLoader);
-
$return = $errorHandler->process($request, $handler);
$this->assertEquals(302, $return->getStatusCode());
@@ -209,6 +213,7 @@ class ErrorHandlerTest extends TestCase
], $session->all());
$request = $request->withAddedHeader('referer', '/foo/batz');
+ $app->instance(Request::class, $request);
$return = $errorHandler->process($request, $handler);
$this->assertEquals('/foo/batz', $return->getHeaderLine('location'));
diff --git a/tests/Unit/Models/Shifts/ScheduleShiftTest.php b/tests/Unit/Models/Shifts/ScheduleShiftTest.php
new file mode 100644
index 00000000..b615f90d
--- /dev/null
+++ b/tests/Unit/Models/Shifts/ScheduleShiftTest.php
@@ -0,0 +1,41 @@
+ 'https://lorem.ipsum/schedule.xml']);
+ $schedule->save();
+
+ $scheduleShift = new ScheduleShift(['shift_id' => 1, 'guid' => 'a']);
+ $scheduleShift->schedule()->associate($schedule);
+ $scheduleShift->save();
+
+ /** @var ScheduleShift $scheduleShift */
+ $scheduleShift = (new ScheduleShift())->find(1);
+ $this->assertInstanceOf(BelongsTo::class, $scheduleShift->schedule());
+ $this->assertEquals($schedule->id, $scheduleShift->schedule->id);
+ }
+
+ /**
+ * Prepare test
+ */
+ protected function setUp(): void
+ {
+ parent::setUp();
+ $this->initDatabase();
+ }
+}
diff --git a/tests/Unit/Models/Shifts/ScheduleTest.php b/tests/Unit/Models/Shifts/ScheduleTest.php
new file mode 100644
index 00000000..34988afd
--- /dev/null
+++ b/tests/Unit/Models/Shifts/ScheduleTest.php
@@ -0,0 +1,37 @@
+ 'https://foo.bar/schedule.xml']);
+ $schedule->save();
+
+ (new ScheduleShift(['shift_id' => 1, 'schedule_id' => $schedule->id, 'guid' => 'a']))->save();
+ (new ScheduleShift(['shift_id' => 2, 'schedule_id' => $schedule->id, 'guid' => 'b']))->save();
+ (new ScheduleShift(['shift_id' => 3, 'schedule_id' => $schedule->id, 'guid' => 'c']))->save();
+
+ $this->assertCount(3, $schedule->scheduleShifts);
+ }
+
+ /**
+ * Prepare test
+ */
+ protected function setUp(): void
+ {
+ parent::setUp();
+ $this->initDatabase();
+ }
+}