Skip to content

Commit

Permalink
Fixs
Browse files Browse the repository at this point in the history
  • Loading branch information
DevFabi committed Sep 28, 2020
1 parent f34abf3 commit f002400
Show file tree
Hide file tree
Showing 61 changed files with 299 additions and 333 deletions.
1 change: 1 addition & 0 deletions .php_cs.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"php":"7.2.11","version":"2.16.4:v2.16.4#1023c3458137ab052f6ff1e09621a721bfdeca13","indent":" ","lineEnding":"\n","rules":{"array_syntax":{"syntax":"short"},"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"braces":{"allow_single_line_closure":true},"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":{"single_line":true},"concat_space":true,"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"magic_method_casing":true,"method_argument_space":true,"native_function_casing":true,"native_function_type_declaration_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_superfluous_phpdoc_tags":{"allow_mixed":true,"allow_unused_params":true},"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":{"namespaces":true},"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"ordered_imports":true,"php_unit_fqcn_annotation":true,"phpdoc_align":{"tags":["method","param","property","return","throws","type","var"]},"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_trim_consecutive_blank_line_separation":true,"phpdoc_types":true,"phpdoc_types_order":{"null_adjustment":"always_last","sort_algorithm":"none"},"phpdoc_var_without_name":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":true,"single_line_comment_style":{"comment_types":["hash"]},"single_line_throw":true,"single_quote":true,"single_trait_insert_per_statement":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"yoda_style":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"src\\Controller\\BookController.php":1250518515,"src\\Controller\\Admin\\AdminAuthorController.php":1038218079,"src\\Controller\\Admin\\AdminBookController.php":2277744630,"src\\Controller\\Admin\\AdminUserController.php":1587634837,"src\\Controller\\AuthorController.php":1802788954,"src\\Controller\\GoogleController.php":2365400516,"src\\Controller\\IndexController.php":984602972,"src\\Controller\\ReadBooksController.php":2766033584,"src\\Controller\\SecurityController.php":2681700632,"src\\Controller\\SubscriptionController.php":2322116320,"src\\Command\\ElasticReindexCommand.php":3840487829,"src\\Command\\UpdateBooksCommand.php":3339367786,"src\\DataFixtures\\AppFixtures.php":2672094028,"src\\Elasticsearch\\BookIndexer.php":1004510983,"src\\Elasticsearch\\IndexBuilder.php":1699684844,"src\\Entity\\Author.php":2480374623,"src\\Entity\\Book.php":3589500687,"src\\Entity\\ReadBooks.php":4281913172,"src\\Entity\\User.php":3960405045,"src\\Events\\Events.php":662020126,"src\\Events\\NewBookNotifySubscriber.php":1157541837,"src\\Factory\\BookCreator.php":534937602,"src\\Factory\\Creator.php":1655237362,"src\\Factory\\ReadBookCreator.php":3856485136,"src\\Form\\AccountType.php":4045040637,"src\\Form\\AuthorType.php":3944114677,"src\\Form\\BookType.php":3469070822,"src\\Form\\PasswordUpdateType.php":613841688,"src\\Form\\SubscriptionFormType.php":2851884337,"src\\Message\\SendNotification.php":3956037816,"src\\MessageHandler\\SendNotificationHandler.php":1218895042,"src\\Repository\\AuthorRepository.php":4260192781,"src\\Repository\\BookRepository.php":1436590697,"src\\Repository\\ReadBooksRepository.php":3645693063,"src\\Repository\\UserRepository.php":2944249750,"src\\Security\\GoogleAuthenticator.php":1555773610,"src\\Security\\LoginFormAuthenticator.php":630540098,"src\\Service\\Books\\GetListOfBooks.php":993619702,"src\\Service\\BookUploader\\AbstractBookUploader.php":1252323476,"src\\Service\\BookUploader\\BookUploaderInterface.php":1178994072,"src\\Service\\BookUploader\\GoogleBookUploader.php":4102888265,"src\\Service\\Mailer\\MailerService.php":415497186,"src\\Service\\Notification\\NotificationInterface.php":1233096405,"src\\Service\\Notification\\NotifiedUser.php":1280056921,"src\\Service\\Subscriptions\\AddSubscriptionService.php":1389215513,"src\\Service\\Subscriptions\\GetUserSubscriptionService.php":939629811,"src\\Specifications\\CanSaveBooksSpecification.php":1778548214,"src\\Specifications\\SpecificationInterface.php":1010788332,"src\\UseCases\\AddUserReadBookUseCase.php":1041779780,"src\\UseCases\\CreateBookUseCase.php":1791933511,"src\\UseCases\\GetAllApiBooks.php":2552761134,"src\\ValueObject\\PasswordUpdate.php":691531422,"tests\\AdminAuthorControllerTest.php":1984739922,"tests\\Behat\\FeatureContext.php":2239619468,"tests\\bootstrap.php":392002581,"tests\\ElasticTest.php":733788722,"tests\\SecurityControllerTest.php":706166086,"tests\\Service\\Mailer\\MailerTest.php":3868724747,"tests\\Service\\Subscriptions\\AddSubscriptionServiceTest.php":3796565349,"tests\\Service\\Subscriptions\\GetUserSubscriptionServiceTest.php":3046515008}}
4 changes: 2 additions & 2 deletions features/admin.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ Feature:

Scenario: I want to display list of author
Given I am on "/author"
And I should see "Author list"
And I should see "Liste des auteurs"

Scenario: I want to display list of books
Given I am on "/books"
And I should see "Books"
And I should see "Livres"

Scenario: I want to try to access admin
Given I am on "/admin/author"
Expand Down
9 changes: 9 additions & 0 deletions features/elastic.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@elastic
Feature:
I want to test some searchs

Scenario: I want to search books by author or book name
Given I am on "/searchBooksBis"
When I fill "Text" with "HarryPotter"
And I press "submit"
And I should see "Harry Potter et le Prisonnier d'Azkaban"
4 changes: 2 additions & 2 deletions features/user.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Feature:
@loginAsUser
Scenario: I want to display list of author
Given I am on "/author"
And I should see "Author list"
And I should see "Liste des auteurs"

@loginAsUser
Scenario: I want to display list of books
Given I am on "/books"
And I should see "Books"
And I should see "Livres"

@loginAsUser
Scenario: I want to try to access admin
Expand Down
16 changes: 16 additions & 0 deletions php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude('vendor')
->exclude('var')
->exclude('public')
->exclude('bin')
->in(__DIR__)
)
;
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<php>
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<env name="KERNEL_CLASS" value="App\Kernel"/>
<server name="SHELL_VERBOSITY" value="-1" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
<server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
Expand Down
2 changes: 0 additions & 2 deletions src/Command/ElasticReindexCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
use App\Elasticsearch\BookIndexer;
use App\Elasticsearch\IndexBuilder;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;

Expand Down
20 changes: 9 additions & 11 deletions src/Command/UpdateBooksCommand.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
declare(strict_types = 1);

namespace App\Command;
declare(strict_types=1);

namespace App\Command;

use App\Entity\Author;
use App\Events\Events;
Expand All @@ -19,7 +19,6 @@
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;


class UpdateBooksCommand extends Command
{
protected static $defaultName = 'app:update-books';
Expand All @@ -43,7 +42,7 @@ class UpdateBooksCommand extends Command
*/
private $createBookUseCase;

public function __construct(BookUploaderInterface $bookUploader, EntityManagerInterface $em, CanSaveBooksSpecification $canSaveBooksSpecification,EventDispatcherInterface $eventDispatcher, LoggerInterface $logger, CreateBookUseCase $createBookUseCase)
public function __construct(BookUploaderInterface $bookUploader, EntityManagerInterface $em, CanSaveBooksSpecification $canSaveBooksSpecification, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger, CreateBookUseCase $createBookUseCase)
{
$this->bookUploader = $bookUploader;
$this->em = $em;
Expand All @@ -65,28 +64,27 @@ protected function configure()
protected function execute(InputInterface $input, OutputInterface $output): int
{
$date = new DateTime('now');
$this->logger->info('Command launch '. date_format($date, 'd/m/Y H:i:s'));
$this->logger->info('Command launch ' . date_format($date, 'd/m/Y H:i:s'));

// 1/ Get all authors
$authors = $this->em->getRepository(Author::class)->findAll();

// 2/ Get all books from googleAPI which are not in database
$books = $this->bookUploader->getAllBooks($authors);

$output->writeln(count($books).' books (not saved)');
$output->writeln(count($books) . ' books (not saved)');

// 3/ Save books in database
foreach ($books as $bookToSave)
{
foreach ($books as $bookToSave) {
if ($this->canSaveBooksSpecification->isSatisfiedBy($bookToSave)) {
$this->createBookUseCase->create($bookToSave);
}
}

// 4/ Send user subscribers
$event = new GenericEvent($date);
$this->eventDispatcher->dispatch($event,Events::NEW_BOOK_NOTIFY);
$event = new GenericEvent($date);
$this->eventDispatcher->dispatch($event, Events::NEW_BOOK_NOTIFY);

return 1;
}
}
}
14 changes: 7 additions & 7 deletions src/Controller/Admin/AdminAuthorController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace App\Controller\Admin;

use App\Entity\Author;
Expand All @@ -14,7 +13,6 @@

class AdminAuthorController extends AbstractController
{

private $em;

public function __construct(EntityManagerInterface $em)
Expand Down Expand Up @@ -51,15 +49,16 @@ public function create(Request $request): Response

$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()){
if ($form->isSubmitted() && $form->isValid()) {
$this->em->persist($author);
$this->em->flush();

return $this->redirectToRoute('admin_author');
}

return $this->render('admin/author/create.html.twig',
[
'form' => $form->createView()
'form' => $form->createView(),
]);
}

Expand All @@ -72,16 +71,17 @@ public function edit(Author $author, Request $request): Response

$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()){
if ($form->isSubmitted() && $form->isValid()) {
$this->em->persist($author);
$this->em->flush();

return $this->redirectToRoute('admin_author');
}

return $this->render('admin/author/edit.html.twig',
[
'form' => $form->createView(),
'author' => $author
'author' => $author,
]);
}

Expand All @@ -97,4 +97,4 @@ public function delete($id): Response

return $this->redirectToRoute('admin_author');
}
}
}
11 changes: 6 additions & 5 deletions src/Controller/Admin/AdminBookController.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

class AdminBookController extends AbstractController
{

private $em;

public function __construct(EntityManagerInterface $em)
Expand Down Expand Up @@ -50,15 +49,16 @@ public function create(Request $request): Response

$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()){
if ($form->isSubmitted() && $form->isValid()) {
$this->em->persist($author);
$this->em->flush();

return $this->redirectToRoute('admin_book');
}

return $this->render('admin/book/create.html.twig',
[
'form' => $form->createView()
'form' => $form->createView(),
]);
}

Expand All @@ -71,16 +71,17 @@ public function edit(Book $book, Request $request): Response

$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()){
if ($form->isSubmitted() && $form->isValid()) {
$this->em->persist($book);
$this->em->flush();

return $this->redirectToRoute('admin_book');
}

return $this->render('admin/book/edit.html.twig',
[
'form' => $form->createView(),
'book' => $book
'book' => $book,
]);
}

Expand Down
15 changes: 7 additions & 8 deletions src/Controller/Admin/AdminUserController.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?php


namespace App\Controller\Admin;


use App\Entity\User;
use App\Form\AccountType;
use Doctrine\ORM\EntityManagerInterface;
Expand All @@ -16,7 +14,6 @@

class AdminUserController extends AbstractController
{

private $em;

public function __construct(EntityManagerInterface $em)
Expand Down Expand Up @@ -53,11 +50,12 @@ public function create(Request $request, UserPasswordEncoderInterface $encoder):

$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()){
if ($form->isSubmitted() && $form->isValid()) {
$hash = $encoder->encodePassword($user, $user->getPassword());
$user->setPassword($hash);
$this->em->persist($user);
$this->em->flush();

return $this->redirectToRoute('admin_user');
}

Expand All @@ -75,15 +73,16 @@ public function edit(User $user, Request $request): Response

$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()){
if ($form->isSubmitted() && $form->isValid()) {
$this->em->persist($user);
$this->em->flush();

return $this->redirectToRoute('admin_user');
}

return $this->render('admin/user/edit.html.twig',[
return $this->render('admin/user/edit.html.twig', [
'form' => $form->createView(),
'user' => $user
'user' => $user,
]);
}
}
}
3 changes: 1 addition & 2 deletions src/Controller/AuthorController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public function listAuthors(): Response
$authors = $this->em->getRepository(Author::class)->findAll();

return $this->render('author/index.html.twig',
["authors" => $authors]);
['authors' => $authors]);
}

}
Loading

0 comments on commit f002400

Please sign in to comment.