From 2af3fe347e8517b4132ddca4968ebeb6a2a4f3c3 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Tue, 26 Oct 2021 16:44:57 +0200 Subject: [PATCH 01/19] Created env file because it was deleted --- .env | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..cfcea58 --- /dev/null +++ b/.env @@ -0,0 +1,36 @@ +# In all environments, the following files are loaded if they exist, +# the latter taking precedence over the former: +# +# * .env contains default values for the environment variables needed by the app +# * .env.local uncommitted file with local overrides +# * .env.$APP_ENV committed environment-specific defaults +# * .env.$APP_ENV.local uncommitted environment-specific overrides +# +# Real environment variables win over .env files. +# +# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES. +# +# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2). +# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration + +###> symfony/framework-bundle ### +APP_ENV=dev +APP_SECRET=86f8e46e16865da05c3cbe1137e8aa22 +###< symfony/framework-bundle ### + +###> symfony/mailer ### +# MAILER_DSN=smtp://localhost +###< symfony/mailer ### + +###> doctrine/doctrine-bundle ### +# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url +# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml +# +# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" + DATABASE_URL="mysql://root:@127.0.0.1:3306/symfony" +#DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=13&charset=utf8" +###< doctrine/doctrine-bundle ### + +###> nelmio/cors-bundle ### +CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$' +###< nelmio/cors-bundle ### \ No newline at end of file From 398c9b14edb5696e9fe9bc47e07b9aba2ff40e44 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Tue, 26 Oct 2021 16:50:47 +0200 Subject: [PATCH 02/19] Fixed deleted code --- src/Service/MealMatcherService.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Service/MealMatcherService.php b/src/Service/MealMatcherService.php index ca03a1d..a770c95 100644 --- a/src/Service/MealMatcherService.php +++ b/src/Service/MealMatcherService.php @@ -77,11 +77,13 @@ public function getMealsForCategory(int $categoryId) } - public function getWinesForMeal($wineId) + /** + * @throws \GuzzleHttp\Exception\GuzzleException + */ + public function getWinesForMeal($mealId) { - $response = $this->client->request('GET', '/api/meal_matches/'.$wineId); + $response = $this->client->request('GET', '/api/meal_matches?mealId=' . $mealId . '&limit=50'); - $wines = json_decode($response->getBody()->getContents()); - return $wines; + return json_decode($response->getBody()->getContents()); } } \ No newline at end of file From 5c7228f8ce643fc755e17b0c73de49da6df0d688 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Tue, 26 Oct 2021 16:54:29 +0200 Subject: [PATCH 03/19] Fixed deleted files --- src/Controller/MealController.php | 9 +++++++ src/Service/MealMatcherService.php | 7 +++++ templates/landing page/index.html.twig | 37 ++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 templates/landing page/index.html.twig diff --git a/src/Controller/MealController.php b/src/Controller/MealController.php index b29411e..beb5eaa 100644 --- a/src/Controller/MealController.php +++ b/src/Controller/MealController.php @@ -10,6 +10,15 @@ class MealController extends AbstractController { + /** + * @throws \GuzzleHttp\Exception\GuzzleException + */ + #[Route('/', name: 'landing_page')] + public function getIndex(MealMatcherService $mealMatcherService): Response + { + return $this->render('landing page/index.html.twig', ['choices' => $mealMatcherService->getIndexPage()]); + } + /** * @throws \GuzzleHttp\Exception\GuzzleException */ diff --git a/src/Service/MealMatcherService.php b/src/Service/MealMatcherService.php index a770c95..1b0ab30 100644 --- a/src/Service/MealMatcherService.php +++ b/src/Service/MealMatcherService.php @@ -13,6 +13,13 @@ public function __construct() $this->client = new Client(['base_uri' => 'https://mealmatcher.grandcruwijnen.nl']); } + /** + */ + public function getIndexPage(): string + { + return 'landing page/index.html.twig'; + } + /** * @throws \GuzzleHttp\Exception\GuzzleException */ diff --git a/templates/landing page/index.html.twig b/templates/landing page/index.html.twig new file mode 100644 index 0000000..ad798f2 --- /dev/null +++ b/templates/landing page/index.html.twig @@ -0,0 +1,37 @@ +{% extends 'base.html.twig' %} +{% block stylesheets %} + +{% endblock %} + +{% block title %}Hello MealController!{% endblock %} + +{% block body %} + + +
+

Grandcruwijnen biedt u de volgende opties:

+
+
+ + + +
+ + +{% endblock %} \ No newline at end of file From e47d569f616c11649372be3b1db105739ee494b5 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Wed, 27 Oct 2021 09:22:34 +0200 Subject: [PATCH 04/19] Fixed deleted code --- src/Controller/MealController.php | 25 +++++-------- templates/categories/index.html.twig | 56 ++++++++++------------------ templates/meals/index.html.twig | 28 ++++++++++---- templates/wines/index.html.twig | 28 +++----------- 4 files changed, 57 insertions(+), 80 deletions(-) diff --git a/src/Controller/MealController.php b/src/Controller/MealController.php index beb5eaa..24a98d5 100644 --- a/src/Controller/MealController.php +++ b/src/Controller/MealController.php @@ -13,16 +13,7 @@ class MealController extends AbstractController { /** * @throws \GuzzleHttp\Exception\GuzzleException */ - #[Route('/', name: 'landing_page')] - public function getIndex(MealMatcherService $mealMatcherService): Response - { - return $this->render('landing page/index.html.twig', ['choices' => $mealMatcherService->getIndexPage()]); - } - - /** - * @throws \GuzzleHttp\Exception\GuzzleException - */ - #[Route('/', name: 'meal_categories')] + #[Route('/categories', name: 'meal_categories')] public function getMealCategories(MealMatcherService $mealMatcherService): Response { return $this->render('categories/index.html.twig', ['meals' => $mealMatcherService->getParentMealCategories()]); @@ -32,7 +23,7 @@ public function getMealCategories(MealMatcherService $mealMatcherService): Respo * @throws \GuzzleHttp\Exception\GuzzleException */ #[Route('/{parentId}', name: 'meal_categories_for_parent')] - public function getCategoriesForParent(int $parentId, MealMatcherService $mealMatcherService) + public function getCategoriesForParent(int $parentId, MealMatcherService $mealMatcherService): Response { return $this->render('categories/index.html.twig', ['meals' => $mealMatcherService->getCategoriesForParent($parentId)]); } @@ -41,14 +32,18 @@ public function getCategoriesForParent(int $parentId, MealMatcherService $mealMa * @throws \GuzzleHttp\Exception\GuzzleException */ #[Route('/meals/{categoryId}', name: 'meals_for_category')] - public function getMealsForCategory(int $categoryId, MealMatcherService $mealMatcherService) + public function getMealsForCategory(int $categoryId, MealMatcherService $mealMatcherService): Response { return $this->render('meals/index.html.twig', ['meals' => $mealMatcherService->getMealsForCategory($categoryId)]); } - #[Route('/wines/{wineId}', name: 'wines_for_meal')] - public function getWinesForMeals($wineId, MealMatcherService $mealMatcherService) + /** + * @throws \GuzzleHttp\Exception\GuzzleException + */ + #[Route('/matches/{mealId}', name: 'wines_for_meals')] + public function getWinesForMeals($mealId, MealMatcherService $mealMatcherService): Response { - return $this->render('wines/index.html.twig', ['wines' => $mealMatcherService->getWinesForMeal($wineId)]); + + return $this->render('wines/index.html.twig', ['matches' => $mealMatcherService->getWinesForMeal($mealId)]); } } \ No newline at end of file diff --git a/templates/categories/index.html.twig b/templates/categories/index.html.twig index c66feec..0551595 100644 --- a/templates/categories/index.html.twig +++ b/templates/categories/index.html.twig @@ -7,41 +7,25 @@ {% block title %}Hello MealController!{% endblock %} {% block body %} - - -
-

U het gerecht en wij adviseren de wijn!

-

-
-{% for meal in meals %} -
- {% if meal.parent is null %} - -
{{ meal.name }}
- -
- -{#
#} - {% else %} - -
{{ meal.name }}
-
- {% endif %} -
+
+

U het gerecht en wij adviseren de wijn!

+

+
+ {% for meal in meals %} +
+ {% if meal.parent is null %} + +
{{ meal.name }}
+ +
+ + {% else %} + +
{{ meal.name }}
+
+ {% endif %} +
{% endfor %} -{% endblock %} - - +{% endblock %} \ No newline at end of file diff --git a/templates/meals/index.html.twig b/templates/meals/index.html.twig index 08c8cab..871157f 100644 --- a/templates/meals/index.html.twig +++ b/templates/meals/index.html.twig @@ -8,16 +8,30 @@ {% block title %}Hello MealController!{% endblock %} +{% extends 'base.html.twig' %} + +{% block stylesheets %} + +{% endblock %} + + +{% block title %}Hello MealController!{% endblock %} + + {% block body %} -{#https://mealmatcher.grandcruwijnen.nl/meals/%7B12de8bb3-8ce2-43a9-8b09-d56161365ebc%7D#} -
+ {# https://mealmatcher.grandcruwijnen.nl/meals/%7B12de8bb3-8ce2-43a9-8b09-d56161365ebc%7D #} +

Welkom bij de online sommelier

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

- {% for meal in meals %} -

{{ meal.name }}

- - {% endfor %} - {% endblock %} + {% for meal in meals %} +

+ + {{ meal.name }} + +

+ {{ meal.name }} + {% endfor %} +{% endblock %} diff --git a/templates/wines/index.html.twig b/templates/wines/index.html.twig index 95ead2c..87ccd07 100644 --- a/templates/wines/index.html.twig +++ b/templates/wines/index.html.twig @@ -3,31 +3,15 @@ {% block title %}Hello MealController!{% endblock %} {% block body %} - -

Welkom bij de online sommelier

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

- {% for wine in wines %} -

{{wine.id}}

- {#

{{ wine.wineId }} + {% for match in matches %} +

{{ match.wine.sku }}

+ {#

{{ wine.wineId }}

#} - {# #} - {% endfor %} - -{% endblock %} - + {# #} + {% endfor %} +{% endblock %} \ No newline at end of file From 484d1aef3338176c755755e1e0d628da3fe3602a Mon Sep 17 00:00:00 2001 From: JurrijnModderman <99053654@mydavinci.nl> Date: Wed, 27 Oct 2021 09:55:36 +0200 Subject: [PATCH 05/19] Fixed deleted code --- src/Controller/MealController.php | 15 +++++--- src/Service/MealMatcherService.php | 8 ++-- templates/base.html.twig | 4 ++ templates/meals/index.html.twig | 12 ++++-- templates/wines/index.html.twig | 60 ++++++++++++++++++++++++++---- 5 files changed, 77 insertions(+), 22 deletions(-) diff --git a/src/Controller/MealController.php b/src/Controller/MealController.php index beb5eaa..f3cde2c 100644 --- a/src/Controller/MealController.php +++ b/src/Controller/MealController.php @@ -22,7 +22,7 @@ public function getIndex(MealMatcherService $mealMatcherService): Response /** * @throws \GuzzleHttp\Exception\GuzzleException */ - #[Route('/', name: 'meal_categories')] + #[Route('/categories', name: 'meal_categories')] public function getMealCategories(MealMatcherService $mealMatcherService): Response { return $this->render('categories/index.html.twig', ['meals' => $mealMatcherService->getParentMealCategories()]); @@ -32,7 +32,7 @@ public function getMealCategories(MealMatcherService $mealMatcherService): Respo * @throws \GuzzleHttp\Exception\GuzzleException */ #[Route('/{parentId}', name: 'meal_categories_for_parent')] - public function getCategoriesForParent(int $parentId, MealMatcherService $mealMatcherService) + public function getCategoriesForParent(int $parentId, MealMatcherService $mealMatcherService): Response { return $this->render('categories/index.html.twig', ['meals' => $mealMatcherService->getCategoriesForParent($parentId)]); } @@ -41,14 +41,17 @@ public function getCategoriesForParent(int $parentId, MealMatcherService $mealMa * @throws \GuzzleHttp\Exception\GuzzleException */ #[Route('/meals/{categoryId}', name: 'meals_for_category')] - public function getMealsForCategory(int $categoryId, MealMatcherService $mealMatcherService) + public function getMealsForCategory(int $categoryId, MealMatcherService $mealMatcherService): Response { return $this->render('meals/index.html.twig', ['meals' => $mealMatcherService->getMealsForCategory($categoryId)]); } - #[Route('/wines/{wineId}', name: 'wines_for_meal')] - public function getWinesForMeals($wineId, MealMatcherService $mealMatcherService) + /** + * @throws \GuzzleHttp\Exception\GuzzleException + */ + #[Route('/matches/{mealId}', name: 'wines_for_meals')] + public function getWinesForMeals($mealId, MealMatcherService $mealMatcherService): Response { - return $this->render('wines/index.html.twig', ['wines' => $mealMatcherService->getWinesForMeal($wineId)]); + return $this->render('wines/index.html.twig', ['matches' => $mealMatcherService->getWinesForMeal($mealId)]); } } \ No newline at end of file diff --git a/src/Service/MealMatcherService.php b/src/Service/MealMatcherService.php index 1b0ab30..337fb6f 100644 --- a/src/Service/MealMatcherService.php +++ b/src/Service/MealMatcherService.php @@ -13,9 +13,10 @@ public function __construct() $this->client = new Client(['base_uri' => 'https://mealmatcher.grandcruwijnen.nl']); } - /** + /** + * @throws \GuzzleHttp\Exception\GuzzleException */ - public function getIndexPage(): string + public function getIndexPage() { return 'landing page/index.html.twig'; } @@ -83,13 +84,12 @@ public function getMealsForCategory(int $categoryId) return json_decode($response->getBody()->getContents()); } - /** * @throws \GuzzleHttp\Exception\GuzzleException */ public function getWinesForMeal($mealId) { - $response = $this->client->request('GET', '/api/meal_matches?mealId=' . $mealId . '&limit=50'); + $response = $this->client->request('GET', '/api/meal_matches?mealId='.$mealId.'&limit=50'); return json_decode($response->getBody()->getContents()); } diff --git a/templates/base.html.twig b/templates/base.html.twig index e3666d5..5f11ae7 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -7,10 +7,14 @@ and uncomment the following Encore helpers to start using Symfony UX #} {% block stylesheets %} {#{{ encore_entry_link_tags('app') }}#} + + {% endblock %} {% block javascripts %} {#{{ encore_entry_script_tags('app') }}#} + + {% endblock %} diff --git a/templates/meals/index.html.twig b/templates/meals/index.html.twig index 08c8cab..4999363 100644 --- a/templates/meals/index.html.twig +++ b/templates/meals/index.html.twig @@ -14,10 +14,14 @@

Welkom bij de online sommelier

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

- {% for meal in meals %} -

{{ meal.name }}

- + {% for meal in meals %} +

+ + {{ meal.name }} + +

+ {{ meal.name }} {% endfor %} - {% endblock %} +{% endblock %} diff --git a/templates/wines/index.html.twig b/templates/wines/index.html.twig index 95ead2c..27c564b 100644 --- a/templates/wines/index.html.twig +++ b/templates/wines/index.html.twig @@ -4,30 +4,74 @@ {% block body %} -
+ +
+ logo +
+ +

Welkom bij de online sommelier

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

- {% for wine in wines %} -

{{wine.id}}

- {#

{{ wine.wineId }} -

#} - {# #} - {% endfor %} + + +
+
+ {% for match in matches %} + +
+ +

{{match.wine.sku}}

+ + + + + + + +
+ {% endfor %} {% endblock %} +{% block javascripts%} + +{% endblock %} \ No newline at end of file From 91974ae99cfc876dd401d44e7ed6d88dc68b3f30 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Wed, 27 Oct 2021 11:07:43 +0200 Subject: [PATCH 06/19] Added links to file --- templates/wines/index.html.twig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/templates/wines/index.html.twig b/templates/wines/index.html.twig index 8594bcb..55d2960 100644 --- a/templates/wines/index.html.twig +++ b/templates/wines/index.html.twig @@ -1,4 +1,10 @@ {% extends 'base.html.twig' %} + {% block stylesheets %} + {#{{ encore_entry_link_tags('app') }}#} + + + {% endblock %} + {% block title %}Hello MealController!{% endblock %} @@ -76,4 +82,7 @@ function goBack(){ } + + + {% endblock %} \ No newline at end of file From 4485c5e4e5e567f9281fe2455ba2d9a971869ebc Mon Sep 17 00:00:00 2001 From: Jelmer Date: Wed, 27 Oct 2021 11:25:25 +0200 Subject: [PATCH 07/19] Formatted code --- src/Controller/MealController.php | 5 +++- src/Service/MealMatcherService.php | 7 ++--- templates/landing page/index.html.twig | 19 +++++++----- templates/wines/index.html.twig | 41 +++++++++++--------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/Controller/MealController.php b/src/Controller/MealController.php index 7eba657..49bb29a 100644 --- a/src/Controller/MealController.php +++ b/src/Controller/MealController.php @@ -10,7 +10,10 @@ class MealController extends AbstractController { - + + /** + * @throws \GuzzleHttp\Exception\GuzzleException + */ #[Route('/', name: 'landing_page')] public function getIndex(MealMatcherService $mealMatcherService): Response { diff --git a/src/Service/MealMatcherService.php b/src/Service/MealMatcherService.php index 337fb6f..b853f93 100644 --- a/src/Service/MealMatcherService.php +++ b/src/Service/MealMatcherService.php @@ -13,10 +13,7 @@ public function __construct() $this->client = new Client(['base_uri' => 'https://mealmatcher.grandcruwijnen.nl']); } - /** - * @throws \GuzzleHttp\Exception\GuzzleException - */ - public function getIndexPage() + public function getIndexPage(): string { return 'landing page/index.html.twig'; } @@ -89,7 +86,7 @@ public function getMealsForCategory(int $categoryId) */ public function getWinesForMeal($mealId) { - $response = $this->client->request('GET', '/api/meal_matches?mealId='.$mealId.'&limit=50'); + $response = $this->client->request('GET', '/api/meal_matches?mealId=' . $mealId . '&limit=50'); return json_decode($response->getBody()->getContents()); } diff --git a/templates/landing page/index.html.twig b/templates/landing page/index.html.twig index ad798f2..d194381 100644 --- a/templates/landing page/index.html.twig +++ b/templates/landing page/index.html.twig @@ -20,18 +20,23 @@ } -
+

Grandcruwijnen biedt u de volgende opties:

- - - + + +
{% endblock %} \ No newline at end of file diff --git a/templates/wines/index.html.twig b/templates/wines/index.html.twig index 55d2960..16956d3 100644 --- a/templates/wines/index.html.twig +++ b/templates/wines/index.html.twig @@ -1,16 +1,15 @@ {% extends 'base.html.twig' %} {% block stylesheets %} - {#{{ encore_entry_link_tags('app') }}#} - - - {% endblock %} - + + +{% endblock %} -{% block title %}Hello MealController!{% endblock %} +{% block title %} + Hello MealController! +{% endblock %} {% block body %} - - - - -
- logo -
+ +
+ logo + +

Welkom bij de online sommelier

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

- -
- {% for match in matches %} - + {% for match in matches %}
- -

{{match.wine.sku}}

+ {{ match.wine.sku }} +

{{match.wine.sku}}

@@ -58,16 +54,15 @@
-
From b37808cf62d070ee05e882409ece46adc4778bc0 Mon Sep 17 00:00:00 2001 From: JurrijnModderman <99053654@mydavinci.nl> Date: Wed, 27 Oct 2021 11:25:42 +0200 Subject: [PATCH 08/19] Added back button --- templates/categories/index.html.twig | 12 ++++++++++++ templates/meals/index.html.twig | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/templates/categories/index.html.twig b/templates/categories/index.html.twig index 0551595..871ef97 100644 --- a/templates/categories/index.html.twig +++ b/templates/categories/index.html.twig @@ -12,6 +12,9 @@

U het gerecht en wij adviseren de wijn!

+ +
+
{% for meal in meals %}
{% if meal.parent is null %} @@ -28,4 +31,13 @@ {% endif %}
{% endfor %} +{% endblock %} + +{% block javascripts%} + + {% endblock %} \ No newline at end of file diff --git a/templates/meals/index.html.twig b/templates/meals/index.html.twig index bee6fdc..13c5291 100644 --- a/templates/meals/index.html.twig +++ b/templates/meals/index.html.twig @@ -14,6 +14,8 @@

Welkom bij de online sommelier

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

+ + {% for meal in meals %}

@@ -26,4 +28,13 @@ {% endblock %} +{% block javascripts%} + + +{% endblock %} + From 162b9e3d4bb2b36e2bd2cc5c8e2851bfc72973e9 Mon Sep 17 00:00:00 2001 From: Kingston Date: Thu, 28 Oct 2021 09:30:33 +0200 Subject: [PATCH 09/19] meals pagina styling klaar --- templates/meals/index.html.twig | 35 ++++++++++++++++++++++----------- templates/wines/index.html.twig | 4 ++-- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/templates/meals/index.html.twig b/templates/meals/index.html.twig index bee6fdc..704895f 100644 --- a/templates/meals/index.html.twig +++ b/templates/meals/index.html.twig @@ -2,27 +2,40 @@ {% block stylesheets %} + + {% endblock %} {% block title %}Hello MealController!{% endblock %} -{% block body %} +{% block body %} + {# https://mealmatcher.grandcruwijnen.nl/meals/%7B12de8bb3-8ce2-43a9-8b09-d56161365ebc%7D #} -

+ logo + +

Welkom bij de online sommelier

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

- - {% for meal in meals %} -

- - {{ meal.name }} - -

- {{ meal.name }} - {% endfor %} +
+
+ {% for meal in meals %} +
+ {{ meal.name }} +

{{ meal.name }}

+ + + +
+ {% endfor %} +
+
{% endblock %} diff --git a/templates/wines/index.html.twig b/templates/wines/index.html.twig index 55d2960..8c41119 100644 --- a/templates/wines/index.html.twig +++ b/templates/wines/index.html.twig @@ -26,9 +26,9 @@ } - +
- logo + logo
From 0f47e444cce71158ae4fdf69ff79a120e01c9bc7 Mon Sep 17 00:00:00 2001 From: Kawian <99052760@mydavinci.nl> Date: Thu, 28 Oct 2021 11:39:50 +0200 Subject: [PATCH 10/19] background-color aangepast en styling toegevoegd aan de pagina --- templates/categories/index.html.twig | 48 +++++++++++++++------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/templates/categories/index.html.twig b/templates/categories/index.html.twig index 871ef97..38b215c 100644 --- a/templates/categories/index.html.twig +++ b/templates/categories/index.html.twig @@ -2,35 +2,39 @@ {% block stylesheets %} + {% endblock %} {% block title %}Hello MealController!{% endblock %} {% block body %} +
+
+
+

U het gerecht en wij adviseren de wijn!

+

+
+ +
+
+ {% for meal in meals %} +
+ {% if meal.parent is null %} + +
{{ meal.name }}
+ +
-
-

U het gerecht en wij adviseren de wijn!

-

+ {% else %} + +
{{ meal.name }}
+
+ {% endif %} +
+ {% endfor %}
- -
-
- {% for meal in meals %} -
- {% if meal.parent is null %} - -
{{ meal.name }}
- -
- - {% else %} - -
{{ meal.name }}
-
- {% endif %} -
- {% endfor %} +
{% endblock %} {% block javascripts%} From b34a9e218f7ff1189f79bf77890a215b94cb1ec1 Mon Sep 17 00:00:00 2001 From: Kingston Date: Thu, 28 Oct 2021 11:44:07 +0200 Subject: [PATCH 11/19] Fixed code --- templates/meals/index.html.twig | 9 --------- 1 file changed, 9 deletions(-) diff --git a/templates/meals/index.html.twig b/templates/meals/index.html.twig index 0cce54b..6081c2d 100644 --- a/templates/meals/index.html.twig +++ b/templates/meals/index.html.twig @@ -41,15 +41,6 @@ - {% for meal in meals %} -

- - {{ meal.name }} - -

- {{ meal.name }} - {% endfor %} - {% endblock %} From bd94480f4cc825f0202badbe752b95a01dcbda8a Mon Sep 17 00:00:00 2001 From: JurrijnModderman <99053654@mydavinci.nl> Date: Thu, 28 Oct 2021 11:44:25 +0200 Subject: [PATCH 12/19] Added some styling --- templates/landing page/index.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/landing page/index.html.twig b/templates/landing page/index.html.twig index d194381..4c9aa70 100644 --- a/templates/landing page/index.html.twig +++ b/templates/landing page/index.html.twig @@ -19,8 +19,8 @@ padding: 2px 6px; } - -
+logo +

Grandcruwijnen biedt u de volgende opties:

From c9d548341babea32965d1084d4487753f0be31f6 Mon Sep 17 00:00:00 2001 From: Kingston Date: Thu, 28 Oct 2021 11:47:03 +0200 Subject: [PATCH 13/19] go back btn deleted --- templates/meals/index.html.twig | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/meals/index.html.twig b/templates/meals/index.html.twig index 6081c2d..a988f47 100644 --- a/templates/meals/index.html.twig +++ b/templates/meals/index.html.twig @@ -38,8 +38,6 @@
- - {% endblock %} From e0c9636d6f663d3851d209f2ee50598b9f6f6e34 Mon Sep 17 00:00:00 2001 From: JurrijnModderman <99053654@mydavinci.nl> Date: Thu, 28 Oct 2021 11:50:16 +0200 Subject: [PATCH 14/19] Changed the text --- templates/wines/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/wines/index.html.twig b/templates/wines/index.html.twig index 52e46bc..fc58f60 100644 --- a/templates/wines/index.html.twig +++ b/templates/wines/index.html.twig @@ -33,7 +33,7 @@

Welkom bij de online sommelier

-

Hier kunt u uw gerecht kiezen en dan worden er bijpassende wijnen gezocht.

+

Hier kunt u kiezen uit de best bijpassende wijnen gezocht bij het geselecteerde gerecht.

From 7eb4d2bc2a1589a1fcf9657274ec63baedaebb8a Mon Sep 17 00:00:00 2001 From: Kingston Date: Thu, 28 Oct 2021 11:56:28 +0200 Subject: [PATCH 15/19] Styling the Category page --- templates/categories/index.html.twig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/categories/index.html.twig b/templates/categories/index.html.twig index 38b215c..c8f7251 100644 --- a/templates/categories/index.html.twig +++ b/templates/categories/index.html.twig @@ -10,11 +10,13 @@ {% block body %}
-
-

U het gerecht en wij adviseren de wijn!

+ + logo + +
+

U het gerecht en wij adviseren de wijn!

-

{% for meal in meals %} From b8d7df1288f5efba6db1c4e1d19a467f21036d8c Mon Sep 17 00:00:00 2001 From: Jelmer Date: Thu, 28 Oct 2021 13:32:47 +0200 Subject: [PATCH 16/19] Added grandcruwijnen/sdk --- composer.json | 20 +- composer.lock | 885 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 607 insertions(+), 298 deletions(-) diff --git a/composer.json b/composer.json index fe2a4b6..23a8f46 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,6 @@ "minimum-stability": "stable", "prefer-stable": true, "require": { - "php": "^8.0", "ext-ctype": "*", "ext-curl": "*", "ext-iconv": "*", @@ -17,7 +16,8 @@ "doctrine/doctrine-migrations-bundle": "^3.1", "doctrine/orm": "^2.10", "doctrine/sql-formatter": "^1.1", - "guzzlehttp/guzzle": "^7.4", + "guzzlehttp/guzzle": "^6.5", + "grandcruwijnen/sdk": "^0.1.26", "nelmio/cors-bundle": "^2.1", "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^6.1", @@ -52,6 +52,8 @@ "twig/twig": "^2.12|^3.0" }, "require-dev": { + "roave/security-advisories": "dev-latest" + , "phpunit/phpunit": "^9.5", "symfony/browser-kit": "5.3.*", "symfony/css-selector": "5.3.*", @@ -66,8 +68,12 @@ "preferred-install": { "*": "dist" }, - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "7.4" + } }, + "autoload": { "psr-4": { "App\\": "src/" @@ -103,5 +109,11 @@ "allow-contrib": false, "require": "5.3.*" } - } + }, + "repositories": [ + { + "type": "composer", + "url": "https://grandcruwijnen-nl.repo.repman.io" + } + ] } diff --git a/composer.lock b/composer.lock index cc286e1..3405319 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ceae5a1259b2a9036482ea9d28347d32", + "content-hash": "d3508be1f7135909222903d386818055", "packages": [ { "name": "api-platform/core", @@ -836,21 +836,21 @@ }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "3.1.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "91f0a5e2356029575f3038432cc188b12f9d5da5" + "reference": "7ad66566ecce0925786707654df15203782f583a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/91f0a5e2356029575f3038432cc188b12f9d5da5", - "reference": "91f0a5e2356029575f3038432cc188b12f9d5da5", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/7ad66566ecce0925786707654df15203782f583a", + "reference": "7ad66566ecce0925786707654df15203782f583a", "shasum": "" }, "require": { "doctrine/doctrine-bundle": "~1.0|~2.0", - "doctrine/migrations": "^3.1", + "doctrine/migrations": "^3.2", "php": "^7.2|^8.0", "symfony/framework-bundle": "~3.4|~4.0|~5.0" }, @@ -900,7 +900,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", - "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.1.1" + "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.2.0" }, "funding": [ { @@ -916,7 +916,7 @@ "type": "tidelift" } ], - "time": "2021-04-10T16:48:53+00:00" + "time": "2021-10-19T16:25:22+00:00" }, { "name": "doctrine/event-manager", @@ -1014,34 +1014,30 @@ }, { "name": "doctrine/inflector", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210" + "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210", - "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", + "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^7.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-strict-rules": "^0.11", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "doctrine/coding-standard": "^8.2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "vimeo/psalm": "^4.10" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" @@ -1089,7 +1085,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.x" + "source": "https://github.com/doctrine/inflector/tree/2.0.4" }, "funding": [ { @@ -1105,7 +1101,7 @@ "type": "tidelift" } ], - "time": "2020-05-29T15:13:26+00:00" + "time": "2021-10-22T20:16:43+00:00" }, { "name": "doctrine/instantiator", @@ -1364,16 +1360,16 @@ }, { "name": "doctrine/orm", - "version": "2.10.1", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "f346379c7bf39a9f46771cfd9043e0eb2dd98793" + "reference": "81d472f6f96b8b571cafefe8d2fef89ed9446a62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/f346379c7bf39a9f46771cfd9043e0eb2dd98793", - "reference": "f346379c7bf39a9f46771cfd9043e0eb2dd98793", + "url": "https://api.github.com/repos/doctrine/orm/zipball/81d472f6f96b8b571cafefe8d2fef89ed9446a62", + "reference": "81d472f6f96b8b571cafefe8d2fef89ed9446a62", "shasum": "" }, "require": { @@ -1405,7 +1401,7 @@ "phpbench/phpbench": "^0.16.10 || ^1.0", "phpstan/phpstan": "0.12.99", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", - "squizlabs/php_codesniffer": "3.6.0", + "squizlabs/php_codesniffer": "3.6.1", "symfony/cache": "^4.4 || ^5.2", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", "vimeo/psalm": "4.10.0" @@ -1457,22 +1453,22 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.10.1" + "source": "https://github.com/doctrine/orm/tree/2.10.2" }, - "time": "2021-10-05T13:04:30+00:00" + "time": "2021-10-21T17:57:02+00:00" }, { "name": "doctrine/persistence", - "version": "2.2.2", + "version": "2.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "4ce4712e6dc84a156176a0fbbb11954a25c93103" + "reference": "5e7bdbbfe9811c06e1f745d1c166647d5c47d6ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/4ce4712e6dc84a156176a0fbbb11954a25c93103", - "reference": "4ce4712e6dc84a156176a0fbbb11954a25c93103", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/5e7bdbbfe9811c06e1f745d1c166647d5c47d6ee", + "reference": "5e7bdbbfe9811c06e1f745d1c166647d5c47d6ee", "shasum": "" }, "require": { @@ -1544,9 +1540,9 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/2.2.2" + "source": "https://github.com/doctrine/persistence/tree/2.2.3" }, - "time": "2021-08-10T19:01:29+00:00" + "time": "2021-10-25T19:59:10+00:00" }, { "name": "doctrine/sql-formatter", @@ -1675,27 +1671,27 @@ }, { "name": "fig/link-util", - "version": "1.2.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/link-util.git", - "reference": "10e52348a2e9ad4581f2bf3e16458f0861a88c6a" + "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/link-util/zipball/10e52348a2e9ad4581f2bf3e16458f0861a88c6a", - "reference": "10e52348a2e9ad4581f2bf3e16458f0861a88c6a", + "url": "https://api.github.com/repos/php-fig/link-util/zipball/5d7b8d04ed3393b4b59968ca1e906fb7186d81e8", + "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8", "shasum": "" }, "require": { - "php": ">=8.0.0", - "psr/link": "^1.1.0 | ^2.0.0" + "php": ">=5.5.0", + "psr/link": "~1.0@dev" }, "provide": { "psr/link-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "^9", + "phpunit/phpunit": "^5.1", "squizlabs/php_codesniffer": "^2.3.1" }, "type": "library", @@ -1730,9 +1726,9 @@ ], "support": { "issues": "https://github.com/php-fig/link-util/issues", - "source": "https://github.com/php-fig/link-util/tree/1.2.0" + "source": "https://github.com/php-fig/link-util/tree/1.1.2" }, - "time": "2021-03-11T23:09:19+00:00" + "time": "2021-02-03T23:36:04+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -1816,47 +1812,96 @@ ], "time": "2021-05-22T16:11:15+00:00" }, + { + "name": "grandcruwijnen/sdk", + "version": "0.1.26", + "source": { + "type": "git", + "url": "git@github.com:Grandcruwijnen/PHP-SDK.git", + "reference": "b3f44274e3ee188d1a4340664856350b3bc56a43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Grandcruwijnen/PHP-SDK/zipball/b3f44274e3ee188d1a4340664856350b3bc56a43", + "reference": "b3f44274e3ee188d1a4340664856350b3bc56a43", + "shasum": "", + "mirrors": [ + { + "url": "https://grandcruwijnen-nl.repo.repman.io/dists/%package%/%version%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-json": "*", + "guzzlehttp/guzzle": "^6.5", + "php": "^7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Grandcruwijnen\\": "src/Grandcruwijnen/", + "": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Grandcruwijnen\\Tests\\": "tests/" + } + }, + "notification-url": "https://grandcruwijnen-nl.repo.repman.io/downloads", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeroen Ketelaar", + "email": "jeroen@grandcruwijnen.nl" + } + ], + "description": "SDK to interact with the Grandcruwijnen.nl Magento 2 API", + "support": { + "source": "https://github.com/Grandcruwijnen/PHP-SDK/tree/0.1.26", + "issues": "https://github.com/Grandcruwijnen/PHP-SDK/issues" + }, + "time": "2020-07-09T22:40:24+00:00" + }, { "name": "guzzlehttp/guzzle", - "version": "7.4.0", + "version": "6.5.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94" + "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", + "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", - "php": "^7.2.5 || ^8.0", - "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2" - }, - "provide": { - "psr/http-client-implementation": "1.0" + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.6.1", + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.17.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", - "psr/log": "^1.1 || ^2.0 || ^3.0" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "psr/log": "^1.1" }, "suggest": { - "ext-curl": "Required for CURL handler support", - "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "6.5-dev" } }, "autoload": { @@ -1872,86 +1917,41 @@ "MIT" ], "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" - }, - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" } ], "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", "keywords": [ "client", "curl", "framework", "http", "http client", - "psr-18", - "psr-7", "rest", "web service" ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.0" + "source": "https://github.com/guzzle/guzzle/tree/6.5" }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", - "type": "tidelift" - } - ], - "time": "2021-10-18T09:52:00+00:00" + "time": "2020-06-16T21:01:06+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "136a635e2b4a49b9d79e9c8fee267ffb257fdba0" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/136a635e2b4a49b9d79e9c8fee267ffb257fdba0", - "reference": "136a635e2b4a49b9d79e9c8fee267ffb257fdba0", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { @@ -2006,7 +2006,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.0" + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, "funding": [ { @@ -2022,36 +2022,33 @@ "type": "tidelift" } ], - "time": "2021-10-07T13:05:22+00:00" + "time": "2021-10-22T20:56:57+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.1.0", + "version": "1.8.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "ralouphie/getallheaders": "^3.0" + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" }, "provide": { - "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -2059,13 +2056,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "1.7-dev" } }, "autoload": { "psr-4": { "GuzzleHttp\\Psr7\\": "src/" - } + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2101,11 +2101,6 @@ "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -2121,7 +2116,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "source": "https://github.com/guzzle/psr7/tree/1.8.3" }, "funding": [ { @@ -2137,7 +2132,7 @@ "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2021-10-05T13:56:00+00:00" }, { "name": "laminas/laminas-code", @@ -2421,16 +2416,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -2441,7 +2436,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -2471,9 +2467,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2527,20 +2523,20 @@ }, { "name": "psr/cache", - "version": "2.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b" + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", - "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=5.3.0" }, "type": "library", "extra": { @@ -2560,7 +2556,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "homepage": "http://www.php-fig.org/" } ], "description": "Common interface for caching libraries", @@ -2570,9 +2566,9 @@ "psr-6" ], "support": { - "source": "https://github.com/php-fig/cache/tree/2.0.0" + "source": "https://github.com/php-fig/cache/tree/master" }, - "time": "2021-02-03T23:23:37+00:00" + "time": "2016-08-06T20:24:11+00:00" }, { "name": "psr/container", @@ -2672,113 +2668,6 @@ }, "time": "2019-01-08T18:20:26+00:00" }, - { - "name": "psr/http-client", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "shasum": "" - }, - "require": { - "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Client\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", - "keywords": [ - "http", - "http-client", - "psr", - "psr-18" - ], - "support": { - "source": "https://github.com/php-fig/http-client/tree/master" - }, - "time": "2020-06-29T06:28:15+00:00" - }, - { - "name": "psr/http-factory", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "shasum": "" - }, - "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for PSR-7 HTTP message factories", - "keywords": [ - "factory", - "http", - "message", - "psr", - "psr-17", - "psr-7", - "request", - "response" - ], - "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" - }, - "time": "2019-04-30T12:38:16+00:00" - }, { "name": "psr/http-message", "version": "1.0.1", @@ -2834,20 +2723,20 @@ }, { "name": "psr/link", - "version": "1.1.1", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/link.git", - "reference": "846c25f58a1f02b93a00f2404e3626b6bf9b7807" + "reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/link/zipball/846c25f58a1f02b93a00f2404e3626b6bf9b7807", - "reference": "846c25f58a1f02b93a00f2404e3626b6bf9b7807", + "url": "https://api.github.com/repos/php-fig/link/zipball/eea8e8662d5cd3ae4517c9b864493f59fca95562", + "reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=5.3.0" }, "type": "library", "extra": { @@ -2871,7 +2760,6 @@ } ], "description": "Common interfaces for HTTP links", - "homepage": "https://github.com/php-fig/link", "keywords": [ "http", "http-link", @@ -2881,36 +2769,36 @@ "rest" ], "support": { - "source": "https://github.com/php-fig/link/tree/1.1.1" + "source": "https://github.com/php-fig/link/tree/master" }, - "time": "2021-03-11T22:59:13+00:00" + "time": "2016-10-28T16:06:13+00:00" }, { "name": "psr/log", - "version": "2.0.0", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "src" + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2931,9 +2819,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/2.0.0" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2021-07-14T16:41:46+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "ralouphie/getallheaders", @@ -2981,16 +2869,16 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v6.2.0", + "version": "v6.2.1", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "3f5b6490878f8a70ba702e9692007cf979b42f0e" + "reference": "7fd1d54c1b27f094a68ae15a99b7fc815857255f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3f5b6490878f8a70ba702e9692007cf979b42f0e", - "reference": "3f5b6490878f8a70ba702e9692007cf979b42f0e", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/7fd1d54c1b27f094a68ae15a99b7fc815857255f", + "reference": "7fd1d54c1b27f094a68ae15a99b7fc815857255f", "shasum": "" }, "require": { @@ -3053,9 +2941,9 @@ ], "support": { "issues": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/issues", - "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.0" + "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.1" }, - "time": "2021-09-06T13:24:35+00:00" + "time": "2021-10-20T09:43:03+00:00" }, { "name": "symfony/asset", @@ -4246,16 +4134,16 @@ }, { "name": "symfony/flex", - "version": "v1.17.1", + "version": "v1.17.2", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "782ef2269622b8349c4bc3dc795fc79d39e8a5b2" + "reference": "0170279814f86648c62aede39b100a343ea29962" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/782ef2269622b8349c4bc3dc795fc79d39e8a5b2", - "reference": "782ef2269622b8349c4bc3dc795fc79d39e8a5b2", + "url": "https://api.github.com/repos/symfony/flex/zipball/0170279814f86648c62aede39b100a343ea29962", + "reference": "0170279814f86648c62aede39b100a343ea29962", "shasum": "" }, "require": { @@ -4294,7 +4182,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.17.1" + "source": "https://github.com/symfony/flex/tree/v1.17.2" }, "funding": [ { @@ -4310,7 +4198,7 @@ "type": "tidelift" } ], - "time": "2021-10-14T06:14:48+00:00" + "time": "2021-10-21T08:39:19+00:00" }, { "name": "symfony/form", @@ -9233,6 +9121,412 @@ ], "time": "2021-09-25T07:38:51+00:00" }, + { + "name": "roave/security-advisories", + "version": "dev-latest", + "source": { + "type": "git", + "url": "https://github.com/Roave/SecurityAdvisories.git", + "reference": "0488e161600117fc3a0d72397dad154729002f54" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0488e161600117fc3a0d72397dad154729002f54", + "reference": "0488e161600117fc3a0d72397dad154729002f54", + "shasum": "" + }, + "conflict": { + "3f/pygmentize": "<1.2", + "adodb/adodb-php": "<5.20.12", + "akaunting/akaunting": "<2.1.13", + "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", + "amazing/media2click": ">=1,<1.3.3", + "amphp/artax": "<1.0.6|>=2,<2.0.6", + "amphp/http": "<1.0.1", + "amphp/http-client": ">=4,<4.4", + "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6", + "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", + "aws/aws-sdk-php": ">=3,<3.2.1", + "bagisto/bagisto": "<0.1.5", + "barrelstrength/sprout-base-email": "<1.2.7", + "barrelstrength/sprout-forms": "<3.9", + "baserproject/basercms": "<=4.5", + "billz/raspap-webgui": "<=2.6.6", + "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", + "bolt/bolt": "<3.7.2", + "bolt/core": "<4.1.13", + "brightlocal/phpwhois": "<=4.2.5", + "buddypress/buddypress": "<5.1.2", + "bugsnag/bugsnag-laravel": ">=2,<2.0.2", + "cachethq/cachet": "<2.5.1", + "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7", + "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", + "cartalyst/sentry": "<=2.1.6", + "centreon/centreon": "<20.10.7", + "cesnet/simplesamlphp-module-proxystatistics": "<3.1", + "codeception/codeception": "<3.1.3|>=4,<4.1.22", + "codeigniter/framework": "<=3.0.6", + "codiad/codiad": "<=2.8.4", + "composer/composer": "<1.10.22|>=2-alpha.1,<2.0.13", + "contao-components/mediaelement": ">=2.14.2,<2.21.1", + "contao/core": ">=2,<3.5.39", + "contao/core-bundle": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|= 4.10.0", + "contao/listing-bundle": ">=4,<4.4.8", + "craftcms/cms": "<3.6.7", + "croogo/croogo": "<3.0.7", + "datadog/dd-trace": ">=0.30,<0.30.2", + "david-garcia/phpwhois": "<=4.3.1", + "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", + "directmailteam/direct-mail": "<5.2.4", + "doctrine/annotations": ">=1,<1.2.7", + "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", + "doctrine/common": ">=2,<2.4.3|>=2.5,<2.5.1", + "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2", + "doctrine/doctrine-bundle": "<1.5.2", + "doctrine/doctrine-module": "<=0.7.1", + "doctrine/mongodb-odm": ">=1,<1.0.2", + "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", + "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", + "dolibarr/dolibarr": "<14|>= 3.3.beta1, < 13.0.2", + "dompdf/dompdf": ">=0.6,<0.6.2", + "drupal/core": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", + "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", + "dweeves/magmi": "<=0.7.24", + "ecodev/newsletter": "<=4", + "endroid/qr-code-bundle": "<3.4.2", + "enshrined/svg-sanitize": "<0.13.1", + "erusev/parsedown": "<1.7.2", + "ether/logs": "<3.0.4", + "ezsystems/demobundle": ">=5.4,<5.4.6.1", + "ezsystems/ez-support-tools": ">=2.2,<2.2.3", + "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1", + "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1", + "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6", + "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", + "ezsystems/ezplatform-kernel": "<=1.2.5|>=1.3,<=1.3.1", + "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", + "ezsystems/ezplatform-user": ">=1,<1.0.1", + "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<=7.5.15.1", + "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.3.5.1", + "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", + "ezsystems/repository-forms": ">=2.3,<2.3.2.1", + "ezyang/htmlpurifier": "<4.1.1", + "facade/ignition": "<1.16.14|>=2,<2.4.2|>=2.5,<2.5.2", + "feehi/cms": "<=2.1.1", + "feehi/feehicms": "<=0.1.3", + "firebase/php-jwt": "<2", + "flarum/core": ">=1,<=1.0.1", + "flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15", + "flarum/tags": "<=0.1-beta.13", + "fluidtypo3/vhs": "<5.1.1", + "fooman/tcpdf": "<6.2.22", + "forkcms/forkcms": "<=5.9.2", + "fossar/tcpdf-parser": "<6.2.22", + "francoisjacquet/rosariosis": "<6.5.1", + "friendsofsymfony/oauth2-php": "<1.3", + "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", + "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", + "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", + "froala/wysiwyg-editor": "<3.2.7", + "fuel/core": "<1.8.1", + "getgrav/grav": "<1.7.21", + "getkirby/cms": "<=3.5.6", + "getkirby/panel": "<2.5.14", + "gilacms/gila": "<=1.11.4", + "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", + "gree/jose": "<=2.2", + "gregwar/rst": "<1.0.3", + "grumpydictator/firefly-iii": "<5.6.1", + "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1", + "helloxz/imgurl": "<=2.31", + "ibexa/post-install": "<=1.0.4", + "icecoder/icecoder": "<=8", + "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10", + "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", + "illuminate/database": "<6.20.26|>=7,<8.40", + "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", + "illuminate/view": ">=7,<7.1.2", + "impresscms/impresscms": "<=1.4.2", + "in2code/femanager": "<5.5.1|>=6,<6.3.1", + "intelliants/subrion": "<=4.2.1", + "ivankristianto/phpwhois": "<=4.3", + "james-heinrich/getid3": "<1.9.9", + "joomla/archive": "<1.1.10", + "joomla/session": "<1.3.1", + "jsmitty12/phpwhois": "<5.1", + "kazist/phpwhois": "<=4.2.6", + "kitodo/presentation": "<3.1.2", + "klaviyo/magento2-extension": ">=1,<3", + "kreait/firebase-php": ">=3.2,<3.8.1", + "la-haute-societe/tcpdf": "<6.2.22", + "laminas/laminas-http": "<2.14.2", + "laravel/framework": "<6.20.26|>=7,<8.40", + "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", + "lavalite/cms": "<=5.8", + "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5", + "league/commonmark": "<0.18.3", + "league/flysystem": "<1.1.4|>=2,<2.1.1", + "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", + "librenms/librenms": "<21.1", + "livewire/livewire": ">2.2.4,<2.2.6", + "lms/routes": "<2.1.1", + "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", + "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3", + "magento/magento1ce": "<1.9.4.3", + "magento/magento1ee": ">=1,<1.14.4.3", + "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2", + "marcwillmann/turn": "<0.3.3", + "mautic/core": "<4|= 2.13.1", + "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35", + "miniorange/miniorange-saml": "<1.4.3", + "mittwald/typo3_forum": "<1.2.1", + "monolog/monolog": ">=1.8,<1.12", + "moodle/moodle": "<3.5.17|>=3.7,<3.7.9|>=3.8,<3.8.8|>=3.9,<3.9.5|>=3.10,<3.10.2", + "namshi/jose": "<2.2", + "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", + "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3", + "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", + "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", + "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", + "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", + "nilsteampassnet/teampass": "<=2.1.27.36", + "nukeviet/nukeviet": "<4.3.4", + "nystudio107/craft-seomatic": "<3.3", + "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", + "october/backend": "<1.1.2", + "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469", + "october/october": ">=1.0.319,<1.0.466", + "october/rain": "<1.0.472|>=1.1,<1.1.2", + "october/system": "<1.0.472|>=1.1.1,<1.1.5", + "onelogin/php-saml": "<2.10.4", + "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", + "opencart/opencart": "<=3.0.3.2", + "openid/php-openid": "<2.3", + "openmage/magento-lts": "<19.4.15|>=20,<20.0.13", + "orchid/platform": ">=9,<9.4.4", + "oro/crm": ">=1.7,<1.7.4", + "oro/platform": ">=1.7,<1.7.4", + "padraic/humbug_get_contents": "<1.1.2", + "pagarme/pagarme-php": ">=0,<3", + "pagekit/pagekit": "<=1.0.18", + "paragonie/random_compat": "<2", + "passbolt/passbolt_api": "<2.11", + "paypal/merchant-sdk-php": "<3.12", + "pear/archive_tar": "<1.4.14", + "personnummer/personnummer": "<3.0.2", + "phanan/koel": "<5.1.4", + "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", + "phpmailer/phpmailer": "<6.5", + "phpmussel/phpmussel": ">=1,<1.6", + "phpmyadmin/phpmyadmin": "<4.9.6|>=5,<5.0.3", + "phpoffice/phpexcel": "<1.8.2", + "phpoffice/phpspreadsheet": "<1.16", + "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7", + "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", + "phpwhois/phpwhois": "<=4.2.5", + "phpxmlrpc/extras": "<0.6.1", + "pimcore/pimcore": "<10.1.3", + "pocketmine/pocketmine-mp": "<3.15.4", + "pressbooks/pressbooks": "<5.18", + "prestashop/autoupgrade": ">=4,<4.10.1", + "prestashop/contactform": ">1.0.1,<4.3", + "prestashop/gamification": "<2.3.2", + "prestashop/productcomments": ">=4,<4.2.1", + "prestashop/ps_emailsubscription": "<2.6.1", + "prestashop/ps_facetedsearch": "<3.4.1", + "privatebin/privatebin": "<1.2.2|>=1.3,<1.3.2", + "propel/propel": ">=2-alpha.1,<=2-alpha.7", + "propel/propel1": ">=1,<=1.7.1", + "pterodactyl/panel": "<0.7.19|>=1-rc.0,<=1-rc.6", + "pusher/pusher-php-server": "<2.2.1", + "pwweb/laravel-core": "<=0.3.6-beta", + "rainlab/debugbar-plugin": "<3.1", + "rmccue/requests": ">=1.6,<1.8", + "robrichards/xmlseclibs": "<3.0.4", + "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", + "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9", + "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11", + "sensiolabs/connect": "<4.2.3", + "serluck/phpwhois": "<=4.2.6", + "shopware/core": "<=6.4.3", + "shopware/platform": "<=6.4.3", + "shopware/production": "<=6.3.5.2", + "shopware/shopware": "<5.6.10", + "showdoc/showdoc": "<=2.9.8", + "silverstripe/admin": ">=1.0.3,<1.0.4|>=1.1,<1.1.1", + "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2", + "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", + "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", + "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", + "silverstripe/framework": "<4.7.4", + "silverstripe/graphql": "<=3.5|>=4-alpha.1,<4-alpha.2", + "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", + "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", + "silverstripe/subsites": ">=2,<2.1.1", + "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1", + "silverstripe/userforms": "<3", + "simple-updates/phpwhois": "<=1", + "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", + "simplesamlphp/simplesamlphp": "<1.18.6", + "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", + "simplito/elliptic-php": "<1.0.6", + "slim/slim": "<2.6", + "smarty/smarty": "<3.1.39", + "socalnick/scn-social-auth": "<1.15.2", + "socialiteproviders/steam": "<1.1", + "spoonity/tcpdf": "<6.2.22", + "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", + "ssddanbrown/bookstack": "<0.29.2", + "stormpath/sdk": ">=0,<9.9.99", + "studio-42/elfinder": "<2.1.59", + "subrion/cms": "<=4.2.1", + "sulu/sulu": "<1.6.41|>=2,<2.0.10|>=2.1,<2.1.1", + "swiftmailer/swiftmailer": ">=4,<5.4.5", + "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", + "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", + "sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", + "sylius/resource-bundle": "<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4", + "sylius/sylius": "<1.6.9|>=1.7,<1.7.9|>=1.8,<1.8.3|>=1.9,<1.9.5", + "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", + "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4", + "symbiote/silverstripe-versionedfiles": "<=2.0.3", + "symfont/process": ">=0,<4", + "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", + "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", + "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", + "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", + "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5", + "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", + "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1", + "symfony/mime": ">=4.3,<4.3.8", + "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/polyfill": ">=1,<1.10", + "symfony/polyfill-php55": ">=1,<1.10", + "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/routing": ">=2,<2.0.19", + "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8", + "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", + "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8|>=5.3,<5.3.2", + "symfony/serializer": ">=2,<2.0.11", + "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.24|>=5,<5.2.9|>=5.3,<5.3.2", + "symfony/translation": ">=2,<2.0.17", + "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", + "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", + "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", + "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", + "t3/dce": ">=2.2,<2.6.2", + "t3g/svg-sanitizer": "<1.0.3", + "tecnickcom/tcpdf": "<6.2.22", + "thelia/backoffice-default-template": ">=2.1,<2.1.2", + "thelia/thelia": ">=2.1-beta.1,<2.1.3", + "theonedemon/phpwhois": "<=4.2.5", + "titon/framework": ">=0,<9.9.99", + "topthink/think": "<=6.0.9", + "topthink/thinkphp": "<=3.2.3", + "tribalsystems/zenario": "<8.8.53370", + "truckersmp/phpwhois": "<=4.3.1", + "twig/twig": "<1.38|>=2,<2.7", + "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.3.2", + "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", + "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<=7.6.52|>=8,<=8.7.41|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.3.2", + "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", + "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", + "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", + "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", + "typo3/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", + "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10", + "ua-parser/uap-php": "<3.8", + "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", + "vanilla/safecurl": "<0.9.2", + "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4", + "vrana/adminer": "<4.7.9", + "wallabag/tcpdf": "<6.2.22", + "web-auth/webauthn-framework": ">=3.3,<3.3.4", + "webcoast/deferred-image-processing": "<1.0.2", + "wikimedia/parsoid": "<0.12.2", + "willdurand/js-translation-bundle": "<2.1.1", + "wp-cli/wp-cli": "<2.5", + "yidashi/yii2cmf": "<=2", + "yii2mod/yii2-cms": "<1.9.2", + "yiisoft/yii": ">=1.1.14,<1.1.15", + "yiisoft/yii2": "<2.0.38", + "yiisoft/yii2-bootstrap": "<2.0.4", + "yiisoft/yii2-dev": "<2.0.43", + "yiisoft/yii2-elasticsearch": "<2.0.5", + "yiisoft/yii2-gii": "<2.0.4", + "yiisoft/yii2-jui": "<2.0.4", + "yiisoft/yii2-redis": "<2.0.8", + "yoast-seo-for-typo3/yoast_seo": "<7.2.3", + "yourls/yourls": "<=1.8.2", + "zendesk/zendesk_api_client_php": "<2.2.11", + "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3", + "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2", + "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", + "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5", + "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3", + "zendframework/zend-diactoros": ">=1,<1.8.4", + "zendframework/zend-feed": ">=1,<2.10.3", + "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1", + "zendframework/zend-http": ">=1,<2.8.1", + "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6", + "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3", + "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2", + "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1", + "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4", + "zendframework/zend-validator": ">=2.3,<2.3.6", + "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1", + "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6", + "zendframework/zendframework": "<=3", + "zendframework/zendframework1": "<1.12.20", + "zendframework/zendopenid": ">=2,<2.0.2", + "zendframework/zendxml": ">=1,<1.0.1", + "zetacomponents/mail": "<1.8.2", + "zf-commons/zfc-user": "<1.2.2", + "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3", + "zfr/zfr-oauth2-server-module": "<0.1.2", + "zoujingli/thinkadmin": "<6.0.22" + }, + "default-branch": true, + "type": "metapackage", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "role": "maintainer" + }, + { + "name": "Ilya Tribusean", + "email": "slash3b@gmail.com", + "role": "maintainer" + } + ], + "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", + "support": { + "issues": "https://github.com/Roave/SecurityAdvisories/issues", + "source": "https://github.com/Roave/SecurityAdvisories/tree/latest" + }, + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories", + "type": "tidelift" + } + ], + "time": "2021-09-30T18:03:50+00:00" + }, { "name": "sebastian/cli-parser", "version": "1.0.1", @@ -10086,7 +10380,6 @@ "type": "github" } ], - "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { @@ -10793,11 +11086,12 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "roave/security-advisories": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.0", "ext-ctype": "*", "ext-curl": "*", "ext-iconv": "*", @@ -10805,5 +11099,8 @@ "ext-simplexml": "*" }, "platform-dev": [], + "platform-overrides": { + "php": "7.4" + }, "plugin-api-version": "2.1.0" } From 17b86a32a77ac5bddba886d72d138a15c941e4cc Mon Sep 17 00:00:00 2001 From: Jelmer Date: Fri, 29 Oct 2021 14:09:58 +0200 Subject: [PATCH 17/19] Now you can see all the wines with this SKU --- src/Controller/MealController.php | 26 ++++++++++++++++++-------- symfony.lock | 6 ++++++ templates/categories/index.html.twig | 3 ++- templates/wines/index.html.twig | 14 ++++++++------ 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/Controller/MealController.php b/src/Controller/MealController.php index 49bb29a..018277b 100644 --- a/src/Controller/MealController.php +++ b/src/Controller/MealController.php @@ -4,16 +4,16 @@ use App\Service\MealMatcherService; +use Grandcruwijnen\SDK\API; +use Grandcruwijnen\SDK\Products; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\HttpFoundation\Response; +use GuzzleHttp\Exception\GuzzleException; class MealController extends AbstractController { - /** - * @throws \GuzzleHttp\Exception\GuzzleException - */ #[Route('/', name: 'landing_page')] public function getIndex(MealMatcherService $mealMatcherService): Response { @@ -21,7 +21,7 @@ public function getIndex(MealMatcherService $mealMatcherService): Response } /** - * @throws \GuzzleHttp\Exception\GuzzleException + * @throws GuzzleException */ #[Route('/categories', name: 'meal_categories')] public function getMealCategories(MealMatcherService $mealMatcherService): Response @@ -30,7 +30,7 @@ public function getMealCategories(MealMatcherService $mealMatcherService): Respo } /** - * @throws \GuzzleHttp\Exception\GuzzleException + * @throws GuzzleException */ #[Route('/{parentId}', name: 'meal_categories_for_parent')] public function getCategoriesForParent(int $parentId, MealMatcherService $mealMatcherService): Response @@ -39,7 +39,7 @@ public function getCategoriesForParent(int $parentId, MealMatcherService $mealMa } /** - * @throws \GuzzleHttp\Exception\GuzzleException + * @throws GuzzleException */ #[Route('/meals/{categoryId}', name: 'meals_for_category')] public function getMealsForCategory(int $categoryId, MealMatcherService $mealMatcherService): Response @@ -48,11 +48,21 @@ public function getMealsForCategory(int $categoryId, MealMatcherService $mealMat } /** - * @throws \GuzzleHttp\Exception\GuzzleException + * @throws GuzzleException */ #[Route('/matches/{mealId}', name: 'wines_for_meals')] public function getWinesForMeals($mealId, MealMatcherService $mealMatcherService): Response { - return $this->render('wines/index.html.twig', ['matches' => $mealMatcherService->getWinesForMeal($mealId)]); + $api = new API("jelmer@grandcruwijnen.nl", "7Wn2okY7!A@mX-DZMmw7tanFaQ*sTGef87o!Gn4_mE6ctiqmLk2hH6LX_deN_K8P7U6LRs7H2BT.cGWvh", "https://beta.grandcruwijnen.dev"); + $products = new Products($api); + $sku = '01001'; + $products = $products->getProduct($sku); +// return $this->products->getProductById($mealId); + +// dump($products); + + return $this->render('wines/index.html.twig', [ + 'products' => $products, 'matches' => $mealMatcherService->getWinesForMeal($mealId) + ]); } } \ No newline at end of file diff --git a/symfony.lock b/symfony.lock index 8527a91..a63b944 100644 --- a/symfony.lock +++ b/symfony.lock @@ -105,6 +105,9 @@ "friendsofphp/proxy-manager-lts": { "version": "v1.0.5" }, + "grandcruwijnen/sdk": { + "version": "0.1.26" + }, "guzzlehttp/guzzle": { "version": "7.4.0" }, @@ -212,6 +215,9 @@ "ralouphie/getallheaders": { "version": "3.0.3" }, + "roave/security-advisories": { + "version": "9999999-dev" + }, "sebastian/cli-parser": { "version": "1.0.1" }, diff --git a/templates/categories/index.html.twig b/templates/categories/index.html.twig index c8f7251..129a3d7 100644 --- a/templates/categories/index.html.twig +++ b/templates/categories/index.html.twig @@ -3,6 +3,7 @@ {% block stylesheets %} + s {% endblock %} {% block title %}Hello MealController!{% endblock %} @@ -12,7 +13,7 @@
logo - +

U het gerecht en wij adviseren de wijn!

diff --git a/templates/wines/index.html.twig b/templates/wines/index.html.twig index fc58f60..f93196f 100644 --- a/templates/wines/index.html.twig +++ b/templates/wines/index.html.twig @@ -38,10 +38,12 @@
- {% for match in matches %} +{# {% for product in products %}#} + {% for product in products %} +
- {{ match.wine.sku }} -

{{match.wine.sku}}

+ +

{{products.name}}

@@ -55,10 +57,10 @@
- {% endfor %} +{% endfor %} {% endblock %} From cb06a9b828d2edde16792a8e53307b99bce9b1bd Mon Sep 17 00:00:00 2001 From: Jelmer Date: Fri, 29 Oct 2021 14:15:55 +0200 Subject: [PATCH 18/19] Fixed error --- src/Service/MealMatcherService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Service/MealMatcherService.php b/src/Service/MealMatcherService.php index d6524de..255ab83 100644 --- a/src/Service/MealMatcherService.php +++ b/src/Service/MealMatcherService.php @@ -86,7 +86,7 @@ public function getMealsForCategory(int $categoryId) return json_decode($response->getBody()->getContents()); } - + /** * @throws GuzzleException */ public function getWinesForMeal($mealId) From edd7ddefbded848b11644876407fe9bacd7f9a07 Mon Sep 17 00:00:00 2001 From: Kingston Date: Fri, 29 Oct 2021 16:01:28 +0200 Subject: [PATCH 19/19] Set images for Category --- templates/categories/index.html.twig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/categories/index.html.twig b/templates/categories/index.html.twig index c8f7251..0bbf444 100644 --- a/templates/categories/index.html.twig +++ b/templates/categories/index.html.twig @@ -19,12 +19,15 @@

+ {% set imageCategory = ['https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/93.svg','https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/52.svg','https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/78.svg','https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/2.svg','https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/139.svg','https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/24.svg','https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/109.svg','https://www.grandcruwijnen.nl/static/version1634749600/frontend/Grandcruwijnen/default/nl_NL/Grandcruwijnen_SmartSommelier/images/102.svg'] %} + {% set imageCounterArr = -1 %} {% for meal in meals %} + {% set imageCounterArr = imageCounterArr + 1 %}
{% if meal.parent is null %}
{{ meal.name }}
-
@@ -34,6 +37,7 @@ {% endif %}
+ {% endfor %}