Skip to content

Commit

Permalink
Use update libs
Browse files Browse the repository at this point in the history
  • Loading branch information
endroid committed Jul 7, 2024
1 parent c9ba9cd commit ff26f7b
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 88 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/.github/ export-ignore
/tests/ export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
12 changes: 6 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
php-versions: ['8.1', '8.2', '8.3']
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
Expand All @@ -26,7 +26,7 @@ jobs:
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache composer dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -58,13 +58,13 @@ jobs:
- name: Archive logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
name: logs-php-${{ matrix.php-versions }}
path: vendor/endroid/quality/application/var/log

- name: Archive code coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage
name: coverage-php-${{ matrix.php-versions }}
path: tests/coverage
12 changes: 2 additions & 10 deletions src/Controller/TeamCalendarController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,21 @@

use Endroid\Calendar\Writer\IcalWriter;
use Endroid\SoccerCalendar\Factory\CalendarFactory;
use Endroid\SoccerData\Loader\CompetitionLoaderInterface;
use Endroid\SoccerData\Loader\GameLoaderInterface;
use Endroid\SoccerData\Loader\TeamLoaderInterface;
use Symfony\Component\HttpFoundation\Response;

final class TeamCalendarController
{
public function __construct(
private readonly CompetitionLoaderInterface $competitionLoader,
private readonly TeamLoaderInterface $teamLoader,
private readonly GameLoaderInterface $gameLoader,
private readonly CalendarFactory $calendarFactory,
private readonly IcalWriter $calendarWriter
) {
}

public function __invoke(string $competitionName, string $teamName): Response
public function __invoke(string $identifier): Response
{
$competition = $this->competitionLoader->loadByName($competitionName);
$this->teamLoader->loadByCompetition($competition);
$team = $competition->getTeamByName($teamName);
$this->gameLoader->loadByTeam($team);

$team = $this->teamLoader->load($identifier);
$calendar = $this->calendarFactory->createTeamCalendar($team);

return new Response($this->calendarWriter->writeToString($calendar, new \DateTimeImmutable(), new \DateTimeImmutable('+1 year')), Response::HTTP_OK, [
Expand Down
36 changes: 0 additions & 36 deletions src/Controller/TeamListController.php

This file was deleted.

6 changes: 1 addition & 5 deletions src/DependencyInjection/EndroidSoccerCalendarExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Endroid\SoccerCalendarBundle\DependencyInjection;

use Endroid\SoccerCalendarBundle\Controller\TeamListController;
use Symfony\Component\Config\Definition\Processor;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
Expand All @@ -17,12 +16,9 @@ final class EndroidSoccerCalendarExtension extends Extension
public function load(array $configs, ContainerBuilder $container): void
{
$processor = new Processor();
$config = $processor->processConfiguration(new Configuration(), $configs);
$processor->processConfiguration(new Configuration(), $configs);

$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yaml');

$teamLoaderControllerDefinition = $container->getDefinition(TeamListController::class);
$teamLoaderControllerDefinition->setArgument(0, $config['competition_names']);
}
}
6 changes: 1 addition & 5 deletions src/Resources/config/routes.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
soccer_calendar_team_calendar:
path: /{competitionName}/team/{teamName}.ics
path: /team/{identifier}.ics
controller: Endroid\SoccerCalendarBundle\Controller\TeamCalendarController

soccer_calendar_team_list:
path: /
controller: Endroid\SoccerCalendarBundle\Controller\TeamListController
9 changes: 2 additions & 7 deletions src/Resources/config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@ services:
Endroid\SoccerCalendar\Factory\CalendarFactory:
public: true

Endroid\SoccerData\Vi\Client: ~
Endroid\SoccerData\Vi\Loader\CompetitionLoader: ~
Endroid\SoccerData\Vi\Loader\TeamLoader: ~
Endroid\SoccerData\Vi\Loader\GameLoader: ~
Endroid\SoccerData\Loader\CompetitionLoaderInterface: '@Endroid\SoccerData\Vi\Loader\CompetitionLoader'
Endroid\SoccerData\Loader\TeamLoaderInterface: '@Endroid\SoccerData\Vi\Loader\TeamLoader'
Endroid\SoccerData\Loader\GameLoaderInterface: '@Endroid\SoccerData\Vi\Loader\GameLoader'
Endroid\SoccerData\Sofascore\Loader\TeamLoader: ~
Endroid\SoccerData\Loader\TeamLoaderInterface: '@Endroid\SoccerData\Sofascore\Loader\TeamLoader'

Endroid\Calendar\Writer\IcalWriter: ~
Empty file added tests/application/.gitkeep
Empty file.
19 changes: 0 additions & 19 deletions tests/application/tests/Controller/TeamListControllerTest.php

This file was deleted.

0 comments on commit ff26f7b

Please sign in to comment.