Format code

This commit is contained in:
Marco Petersen 2018-09-12 23:25:22 +03:00
parent 60119c5b1b
commit f1b9ffd160
40 changed files with 257 additions and 301 deletions

View File

@ -1,17 +1,15 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface ActivationInterface interface ActivationInterface
{ {
public function deactivate():Response; public function deactivate(): Response;
public function activate():Response;
}
public function activate(): Response;
}

View File

@ -1,17 +1,15 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface CreationInterface interface CreationInterface
{ {
public function create():Response; public function create(): Response;
public function delete():Response;
}
public function delete(): Response;
}

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@ -6,9 +7,7 @@ use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class DefaultController extends AbstractController implements DefaultControllerInterface class DefaultController extends AbstractController implements DefaultControllerInterface
{ {
@ -17,15 +16,14 @@ class DefaultController extends AbstractController implements DefaultControllerI
*/ */
public function imprint(): Response public function imprint(): Response
{ {
return $this->render("standard/imprint.html.twig"); return $this->render('standard/imprint.html.twig');
} }
/** /**
* @Route("/", name="homepage") * @Route("/", name="homepage")
*/ */
public function homepage(): Response public function homepage(): Response
{ {
return $this->render("standard/homepage.html.twig"); return $this->render('standard/homepage.html.twig');
} }
} }

View File

@ -1,17 +1,15 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface DefaultControllerInterface interface DefaultControllerInterface
{ {
public function homepage():Response; public function homepage(): Response;
public function imprint():Response;
}
public function imprint(): Response;
}

View File

@ -1,15 +1,13 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface ModificationInterface interface ModificationInterface
{ {
public function modify(int $id):Response; public function modify(int $id): Response;
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use App\Form\UserType; use App\Form\UserType;
@ -7,25 +8,20 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Form\FormInterface;
class RegistrationController extends AbstractController class RegistrationController extends AbstractController
{ {
/** /**
*
* @var User * @var User
*/ */
private $user; private $user;
/** /**
*
* @Route("/register", name="user_register") * @Route("/register", name="user_register")
*/ */
public function register(Request $request, UserPasswordEncoderInterface $passwordEncoder,TranslatorInterface $translator): Response public function register(Request $request, UserPasswordEncoderInterface $passwordEncoder, TranslatorInterface $translator): Response
{ {
$this->user = new User(); $this->user = new User();
$form = $this->createForm(UserType::class, $this->user); $form = $this->createForm(UserType::class, $this->user);
@ -33,11 +29,13 @@ class RegistrationController extends AbstractController
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted() && $form->isValid()) {
$this->encodePassword($passwordEncoder); $this->encodePassword($passwordEncoder);
$this->saveUser($translator); $this->saveUser($translator);
return $this->redirectToRoute('login'); return $this->redirectToRoute('login');
} }
return $this->render("user/register.html.twig", array(
'form' => $form->createView() return $this->render('user/register.html.twig', [
)); 'form' => $form->createView(),
]);
} }
public function encodePassword(UserPasswordEncoderInterface $passwordEncoder): void public function encodePassword(UserPasswordEncoderInterface $passwordEncoder): void
@ -52,10 +50,9 @@ class RegistrationController extends AbstractController
$entityManager->persist($this->user); $entityManager->persist($this->user);
try { try {
$entityManager->flush(); $entityManager->flush();
$this->addFlash('success', $translator->trans('User "%username%" created!',['%username%'=>$this->user->getUsername()])); $this->addFlash('success', $translator->trans('User "%username%" created!', ['%username%' => $this->user->getUsername()]));
} catch (\Exception $exception) { } catch (\Exception $exception) {
$this->addFlash('danger', $translator->trans('User "%username%" could not be created!',['%username%'=>$this->user->getUsername()])); $this->addFlash('danger', $translator->trans('User "%username%" could not be created!', ['%username%' => $this->user->getUsername()]));
} }
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
@ -8,30 +9,27 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Translation\TranslatorInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class SecurityController extends AbstractController class SecurityController extends AbstractController
{ {
/** /**
*
* @Route("/login", name="login") * @Route("/login", name="login")
*/ */
public function login(AuthenticationUtils $authenticationUtils,TranslatorInterface $translator): Response public function login(AuthenticationUtils $authenticationUtils, TranslatorInterface $translator): Response
{ {
$error = $authenticationUtils->getLastAuthenticationError(); $error = $authenticationUtils->getLastAuthenticationError();
if ($error) { if ($error) {
$this->addFlash('danger', $translator->trans($error->getMessageKey(),$error->getMessageData(),'security')); $this->addFlash('danger', $translator->trans($error->getMessageKey(), $error->getMessageData(), 'security'));
}else{ } else {
$lastUsername = $authenticationUtils->getLastUsername(); $lastUsername = $authenticationUtils->getLastUsername();
if($lastUsername){ if ($lastUsername) {
$this->addFlash('success', $translator->trans('User %user% loged in.',['%user%'=>$lastUsername])); $this->addFlash('success', $translator->trans('User %user% loged in.', ['%user%' => $lastUsername]));
} }
} }
return $this->render("user/login.html.twig",[
'last_username'=>$authenticationUtils->getLastUsername(), return $this->render('user/login.html.twig', [
'last_username' => $authenticationUtils->getLastUsername(),
]); ]);
} }
} }

View File

@ -1,32 +1,35 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class SourceController implements SourceControllerInterface class SourceController implements SourceControllerInterface
{ {
public function modify(int $id): Response public function modify(int $id): Response
{} {
}
public function show(int $id): Response public function show(int $id): Response
{} {
}
public function activate(): Response public function activate(): Response
{} {
}
public function create(): Response public function create(): Response
{} {
}
public function delete(): Response public function delete(): Response
{} {
}
public function deactivate(): Response public function deactivate(): Response
{} {
}
} }

View File

@ -1,15 +1,13 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface SourceControllerInterface extends CreationInterface, ActivationInterface, ModificationInterface interface SourceControllerInterface extends CreationInterface, ActivationInterface, ModificationInterface
{ {
public function show(int $id):Response; public function show(int $id): Response;
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use App\Entity\Attribut\IdAttribut; use App\Entity\Attribut\IdAttribut;
@ -6,22 +7,20 @@ use App\Entity\Attribut\NodeAttribut;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
* @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/inheritance-mapping.html * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/inheritance-mapping.html
* @ORM\Entity * @ORM\Entity
* @ORM\InheritanceType("JOINED") * @ORM\InheritanceType("JOINED")
* @ORM\DiscriminatorColumn(name="discr", type="string") * @ORM\DiscriminatorColumn(name="discr", type="string")
* @ORM\DiscriminatorMap({"user" = "User"}) * @ORM\DiscriminatorMap({"user" = "User"})
*/ */
abstract class AbstractSource implements SourceInterface abstract class AbstractSource implements SourceInterface
{ {
use IdAttribut,NodeAttribut; use IdAttribut,NodeAttribut;
/** /**
*
* @var ConfigurationInterface * @var ConfigurationInterface
*/ */
protected $configuration; protected $configuration;
}
}

View File

@ -1,36 +1,35 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use App\Entity\NodeInterface; use App\Entity\NodeInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait ChildsAttribut { trait ChildsAttribut
{
/** /**
* Many Nodes have many childs * Many Nodes have many childs.
*
* @ORM\ManyToMany(targetEntity="Node") * @ORM\ManyToMany(targetEntity="Node")
* @ORM\JoinTable(name="nodes_childs", * @ORM\JoinTable(name="nodes_childs",
* joinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")}, * joinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")},
* inverseJoinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")} * inverseJoinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")}
* ) * )
*
* @var ArrayCollection|NodeInterface[] * @var ArrayCollection|NodeInterface[]
*/ */
protected $childs; protected $childs;
public function getChilds(): ArrayCollection public function getChilds(): ArrayCollection
{ {
return $this->getChilds(); return $this->getChilds();
} }
public function setChilds(ArrayCollection $childs): void public function setChilds(ArrayCollection $childs): void
{ {
$this->childs = $childs; $this->childs = $childs;
} }
} }

View File

@ -1,15 +1,15 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface ChildsAttributeInterface interface ChildsAttributeInterface
{ {
public function setChilds(ArrayCollection $childs):void; public function setChilds(ArrayCollection $childs): void;
public function getChilds():ArrayCollection;
}
public function getChilds(): ArrayCollection;
}

View File

@ -1,27 +1,26 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait IdAttribut { trait IdAttribut
{
/** /**
* @ORM\Id * @ORM\Id
* @ORM\GeneratedValue * @ORM\GeneratedValue
* @ORM\Column(type="integer")(strategy="AUTO") * @ORM\Column(type="integer")(strategy="AUTO")
*/ */
protected $id; protected $id;
public function setId(int $id): void public function setId(int $id): void
{ {
$this->id = $id; $this->id = $id;
} }
public function getId(): int public function getId(): int
{ {
return $this->id; return $this->id;
} }
} }

View File

@ -1,15 +1,13 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface IdAttributInterface interface IdAttributInterface
{ {
public function setId(int $id): void; public function setId(int $id): void;
public function getId(): int; public function getId(): int;
} }

View File

@ -1,30 +1,28 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\NodeInterface; use App\Entity\NodeInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait NodeAttribut{ trait NodeAttribut
{
/** /**
* @var NodeInterface * @var NodeInterface
* @ORM\OneToOne(targetEntity="Node") * @ORM\OneToOne(targetEntity="Node")
* @ORM\JoinColumn(name="node_id", referencedColumnName="id") * @ORM\JoinColumn(name="node_id", referencedColumnName="id")
*/ */
protected $node; protected $node;
public function setNode(NodeInterface $node): void public function setNode(NodeInterface $node): void
{ {
$this->node = $node; $this->node = $node;
} }
public function getNode(): NodeInterface public function getNode(): NodeInterface
{ {
return $this->node; return $this->node;
} }
} }

View File

@ -1,17 +1,15 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\NodeInterface; use App\Entity\NodeInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface NodeAttributInterface interface NodeAttributInterface
{ {
public function setNode(NodeInterface $node):void; public function setNode(NodeInterface $node): void;
public function getNode():NodeInterface;
}
public function getNode(): NodeInterface;
}

View File

@ -1,24 +1,24 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use App\Entity\NodeInterface; use App\Entity\NodeInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait ParentAttribut { trait ParentAttribut
{
/** /**
* Many Nodes have many parents * Many Nodes have many parents.
* *
* @ORM\ManyToMany(targetEntity="Node") * @ORM\ManyToMany(targetEntity="Node")
* @ORM\JoinTable(name="nodes_parents", * @ORM\JoinTable(name="nodes_parents",
* joinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")}, * joinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")},
* inverseJoinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")} * inverseJoinColumns={@ORM\JoinColumn(name="node_id", referencedColumnName="id")}
* ) * )
*
* @var ArrayCollection|NodeInterface[] * @var ArrayCollection|NodeInterface[]
*/ */
protected $parents; protected $parents;
@ -33,4 +33,3 @@ trait ParentAttribut {
$this->parents = $parents; $this->parents = $parents;
} }
} }

View File

@ -1,17 +1,15 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface ParentsAttributInterface interface ParentsAttributInterface
{ {
public function setParents(ArrayCollection $parents):void; public function setParents(ArrayCollection $parents): void;
public function getParents():ArrayCollection;
}
public function getParents(): ArrayCollection;
}

View File

@ -1,24 +1,24 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait PasswordAttribut { trait PasswordAttribut
{
/** /**
* @ORM\Column(type="string", length=64) * @ORM\Column(type="string", length=64)
*/ */
protected $password; protected $password;
public function getPassword():?string public function getPassword(): ?string
{ {
return $this->password; return $this->password;
} }
public function setPassword(string $password):void{ public function setPassword(string $password): void
{
$this->password = $password; $this->password = $password;
} }
} }

View File

@ -1,18 +1,18 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait PlainPasswordAttribute { trait PlainPasswordAttribute
{
/** /**
*
* @Assert\NotBlank() * @Assert\NotBlank()
* @Assert\Length(max=4096) * @Assert\Length(max=4096)
*
* @var string * @var string
*/ */
private $plainPassword; private $plainPassword;
@ -27,4 +27,3 @@ trait PlainPasswordAttribute {
$this->plainPassword = $password; $this->plainPassword = $password;
} }
} }

View File

@ -1,27 +1,29 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\SourceInterface; use App\Entity\SourceInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait SourceAttribut { trait SourceAttribut
{
/** /**
* @ORM\OneToOne(targetEntity="AbstractSource") * @ORM\OneToOne(targetEntity="AbstractSource")
* @ORM\JoinColumn(name="source_id", referencedColumnName="id") * @ORM\JoinColumn(name="source_id", referencedColumnName="id")
*
* @var SourceInterface * @var SourceInterface
*/ */
protected $source; protected $source;
public function getSource():SourceInterface{ public function getSource(): SourceInterface
{
return $this->source; return $this->source;
} }
public function setSource(SourceInterface $source):void{ public function setSource(SourceInterface $source): void
{
$this->source = $source; $this->source = $source;
} }
} }

View File

@ -1,17 +1,15 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\SourceInterface; use App\Entity\SourceInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface SourceAttributInterface interface SourceAttributInterface
{ {
public function getSource():SourceInterface; public function getSource(): SourceInterface;
public function setSource(SourceInterface $source):void;
}
public function setSource(SourceInterface $source): void;
}

View File

@ -1,25 +1,26 @@
<?php <?php
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
/** /**
* This trait doesn't need an own interface because it's covered by symfony * This trait doesn't need an own interface because it's covered by symfony.
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
trait UsernameAttribut{ trait UsernameAttribut
{
/** /**
* @ORM\Column(type="string", length=25, unique=true) * @ORM\Column(type="string", length=25, unique=true)
*/ */
protected $username; protected $username;
public function getUsername():?string public function getUsername(): ?string
{ {
return $this->username; return $this->username;
} }
public function setUsername(string $username):void{ public function setUsername(string $username): void
{
$this->username = \trim($username); $this->username = \trim($username);
} }
} }

View File

@ -1,48 +1,48 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class Configuration implements ConfigurationInterface class Configuration implements ConfigurationInterface
{ {
/** /**
*
* @var PropertyInterface * @var PropertyInterface
*/ */
protected $read; protected $read;
/** /**
*
* @var PropertyInterface * @var PropertyInterface
*/ */
protected $write; protected $write;
/** /**
*
* @var PropertyInterface * @var PropertyInterface
*/ */
protected $administrate; protected $administrate;
public function setAdministrate(Property $administrate): void public function setAdministrate(Property $administrate): void
{} {
}
public function getAdministrate(): Property public function getAdministrate(): Property
{} {
}
public function setWrite(Property $write): void public function setWrite(Property $write): void
{} {
}
public function getWrite(): Property public function getWrite(): Property
{} {
}
public function setRead(Property $read): void public function setRead(Property $read): void
{} {
}
public function getRead(): Property public function getRead(): Property
{} {
}
} }

View File

@ -1,24 +1,23 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
/** /**
* This class is not a source! * This class is not a source!
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface ConfigurationInterface interface ConfigurationInterface
{ {
public function setRead(Property $read):void; public function setRead(Property $read): void;
public function getRead():Property;
public function setWrite(Property $write):void;
public function getWrite():Property;
public function setAdministrate(Property $administrate):void;
public function getAdministrate():Property;
}
public function getRead(): Property;
public function setWrite(Property $write): void;
public function getWrite(): Property;
public function setAdministrate(Property $administrate): void;
public function getAdministrate(): Property;
}

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
@ -8,7 +9,6 @@ use App\Entity\Attribut\ParentAttribut;
use App\Entity\Attribut\ChildsAttribut; use App\Entity\Attribut\ChildsAttribut;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
* @ORM\Table(name="node") * @ORM\Table(name="node")
* @ORM\Entity(repositoryClass="App\Repository\NodeRepository") * @ORM\Entity(repositoryClass="App\Repository\NodeRepository")
@ -16,8 +16,7 @@ use App\Entity\Attribut\ChildsAttribut;
class Node implements NodeInterface class Node implements NodeInterface
{ {
use IdAttribut, use IdAttribut,
SourceAttribut, SourceAttribut,
ParentAttribut, ParentAttribut,
ChildsAttribut; ChildsAttribut;
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use App\Entity\Attribut\SourceAttributInterface; use App\Entity\Attribut\SourceAttributInterface;
@ -7,10 +8,8 @@ use App\Entity\Attribut\ParentsAttributInterface;
use App\Entity\Attribut\ChildsAttributeInterface; use App\Entity\Attribut\ChildsAttributeInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface NodeInterface extends SourceAttributInterface, IdAttributInterface,ParentsAttributInterface,ChildsAttributeInterface interface NodeInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface
{} {
}

View File

@ -1,32 +1,29 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class Property implements PropertyInterface class Property implements PropertyInterface
{ {
/** /**
*
* @var ArrayCollection|NodeInterface[] * @var ArrayCollection|NodeInterface[]
*/ */
protected $whitelist; protected $whitelist;
/** /**
*
* @var ArrayCollection|NodeInterface[] * @var ArrayCollection|NodeInterface[]
*/ */
protected $blacklist; protected $blacklist;
public function getLegitimated(): ArrayCollection public function getLegitimated(): ArrayCollection
{} {
}
public function isLegitimated(SourceInterface $source): bool public function isLegitimated(SourceInterface $source): bool
{} {
}
} }

View File

@ -1,17 +1,15 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface PropertyInterface interface PropertyInterface
{ {
public function isLegitimated(SourceInterface $source):bool; public function isLegitimated(SourceInterface $source): bool;
public function getLegitimated():ArrayCollection;
}
public function getLegitimated(): ArrayCollection;
}

View File

@ -1,15 +1,13 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use App\Entity\Attribut\NodeAttributInterface; use App\Entity\Attribut\NodeAttributInterface;
use App\Entity\Attribut\IdAttributInterface; use App\Entity\Attribut\IdAttributInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface SourceInterface extends IdAttributInterface, NodeAttributInterface interface SourceInterface extends IdAttributInterface, NodeAttributInterface
{ {
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
@ -7,7 +8,6 @@ use App\Entity\Attribut\PasswordAttribut;
use App\Entity\Attribut\PlainPasswordAttribute; use App\Entity\Attribut\PlainPasswordAttribute;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
* @ORM\Table(name="source_user") * @ORM\Table(name="source_user")
* @ORM\Entity(repositoryClass="App\Repository\UserRepository") * @ORM\Entity(repositoryClass="App\Repository\UserRepository")
@ -15,7 +15,7 @@ use App\Entity\Attribut\PlainPasswordAttribute;
class User extends AbstractSource implements UserInterface class User extends AbstractSource implements UserInterface
{ {
use UsernameAttribut,PasswordAttribut,PlainPasswordAttribute; use UsernameAttribut,PasswordAttribut,PlainPasswordAttribute;
/** /**
* @ORM\Column(name="is_active", type="boolean") * @ORM\Column(name="is_active", type="boolean")
*/ */
@ -33,7 +33,7 @@ class User extends AbstractSource implements UserInterface
public function getRoles() public function getRoles()
{ {
return array('ROLE_USER'); return ['ROLE_USER'];
} }
public function eraseCredentials() public function eraseCredentials()
@ -43,20 +43,19 @@ class User extends AbstractSource implements UserInterface
/** @see \Serializable::serialize() */ /** @see \Serializable::serialize() */
public function serialize() public function serialize()
{ {
return serialize(array( return serialize([
$this->id, $this->id,
$this->username, $this->username,
$this->password, $this->password,
)); ]);
} }
/** @see \Serializable::unserialize() */ /** @see \Serializable::unserialize() */
public function unserialize($serialized) public function unserialize($serialized)
{ {
list ( list(
$this->id, $this->id,
$this->username, $this->username,
$this->password, $this->password) = unserialize($serialized, ['allowed_classes' => false]);
) = unserialize($serialized, array('allowed_classes' => false));
} }
} }

View File

@ -1,14 +1,12 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface; use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
interface UserInterface extends SymfonyUserInterface, \Serializable interface UserInterface extends SymfonyUserInterface, \Serializable
{ {
} }

View File

@ -10,29 +10,29 @@ use Symfony\Component\HttpFoundation\RequestStack;
class UserMenuEvent extends Event class UserMenuEvent extends Event
{ {
public const EVENT = 'app.menu.topbar.user'; public const EVENT = 'app.menu.topbar.user';
/** /**
* @var FactoryInterface * @var FactoryInterface
*/ */
private $factory; private $factory;
/** /**
* @var ItemInterface * @var ItemInterface
*/ */
private $item; private $item;
/** /**
* @var RequestStack * @var RequestStack
*/ */
private $request; private $request;
public function __construct(FactoryInterface $factory, ItemInterface $item, RequestStack $request) public function __construct(FactoryInterface $factory, ItemInterface $item, RequestStack $request)
{ {
$this->factory = $factory; $this->factory = $factory;
$this->item = $item; $this->item = $item;
$this->request = $request; $this->request = $request;
} }
/** /**
* @return FactoryInterface * @return FactoryInterface
*/ */
@ -40,7 +40,7 @@ class UserMenuEvent extends Event
{ {
return $this->factory; return $this->factory;
} }
/** /**
* @return ItemInterface * @return ItemInterface
*/ */
@ -48,7 +48,7 @@ class UserMenuEvent extends Event
{ {
return $this->item; return $this->item;
} }
/** /**
* @return RequestStack * @return RequestStack
*/ */
@ -56,4 +56,4 @@ class UserMenuEvent extends Event
{ {
return $this->request; return $this->request;
} }
} }

View File

@ -1,11 +1,11 @@
<?php <?php
namespace App\Form; namespace App\Form;
use App\Entity\User; use App\Entity\User;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType; use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType; use Symfony\Component\Form\Extension\Core\Type\PasswordType;
@ -16,18 +16,18 @@ class UserType extends AbstractType
{ {
$builder $builder
->add('username', TextType::class) ->add('username', TextType::class)
->add('plainPassword', RepeatedType::class, array( ->add('plainPassword', RepeatedType::class, [
'type' => PasswordType::class, 'type' => PasswordType::class,
'first_options' => array('label' => 'Password'), 'first_options' => ['label' => 'Password'],
'second_options' => array('label' => 'Repeat Password'), 'second_options' => ['label' => 'Repeat Password'],
)) ])
; ;
} }
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults([
'data_class' => User::class, 'data_class' => User::class,
)); ]);
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
// src/Menu/Menu.php // src/Menu/Menu.php
namespace App\Menu; namespace App\Menu;
@ -11,36 +12,35 @@ use Symfony\Component\HttpFoundation\RequestStack;
class Menu class Menu
{ {
/** /**
* @var EventDispatcherInterface * @var EventDispatcherInterface
*/ */
private $dispatcher; private $dispatcher;
/** /**
* @var FactoryInterface * @var FactoryInterface
*/ */
private $factory; private $factory;
public function __construct(FactoryInterface $factory, EventDispatcherInterface $dispatcher) public function __construct(FactoryInterface $factory, EventDispatcherInterface $dispatcher)
{ {
$this->dispatcher = $dispatcher; $this->dispatcher = $dispatcher;
$this->factory = $factory; $this->factory = $factory;
} }
public function userTopbar(RequestStack $request): ItemInterface public function userTopbar(RequestStack $request): ItemInterface
{ {
$menu = $this->factory->createItem('root', array( $menu = $this->factory->createItem('root', [
'childrenAttributes' => array( 'childrenAttributes' => [
'class' => 'navbar-nav mr-auto', 'class' => 'navbar-nav mr-auto',
), ],
)); ]);
$this->dispatcher->dispatch( $this->dispatcher->dispatch(
UserMenuEvent::EVENT, UserMenuEvent::EVENT,
new UserMenuEvent($this->factory, $menu, $request) new UserMenuEvent($this->factory, $menu, $request)
); );
return $menu; return $menu;
} }
} }

View File

@ -1,14 +1,12 @@
<?php <?php
namespace App\Repository; namespace App\Repository;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class UserRepository extends EntityRepository class UserRepository extends EntityRepository
{ {
} }

View File

@ -1,5 +1,7 @@
<?php <?php
namespace App\Subscriber; namespace App\Subscriber;
use App\Event\Menu\Topbar\UserMenuEvent; use App\Event\Menu\Topbar\UserMenuEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@ -7,15 +9,12 @@ use Symfony\Component\Translation\TranslatorInterface;
class UserMenuSubscriber implements EventSubscriberInterface class UserMenuSubscriber implements EventSubscriberInterface
{ {
/** /**
*
* @var TokenStorageInterface * @var TokenStorageInterface
*/ */
private $tokenStorage; private $tokenStorage;
/** /**
*
* @var TranslatorInterface * @var TranslatorInterface
*/ */
private $translator; private $translator;
@ -42,7 +41,7 @@ class UserMenuSubscriber implements EventSubscriberInterface
$menu->addChild( $menu->addChild(
'imprint', 'imprint',
[ [
'route'=>'imprint', 'route' => 'imprint',
'attributes' => [ 'attributes' => [
'icon' => 'fas fa-address-card', 'icon' => 'fas fa-address-card',
], ],
@ -95,7 +94,7 @@ class UserMenuSubscriber implements EventSubscriberInterface
public static function getSubscribedEvents(): array public static function getSubscribedEvents(): array
{ {
return [ return [
UserMenuEvent::EVENT => 'onUserMenuConfigure' UserMenuEvent::EVENT => 'onUserMenuConfigure',
]; ];
} }
} }

View File

@ -1,15 +1,13 @@
<?php <?php
namespace App\Tests\Unit\Controller;
namespace App\Tests\Unit\Controller;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use App\Controller\DefaultControllerInterface; use App\Controller\DefaultControllerInterface;
use App\Controller\DefaultController; use App\Controller\DefaultController;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class DefaultControllerTest extends WebTestCase class DefaultControllerTest extends WebTestCase
{ {
@ -17,21 +15,23 @@ class DefaultControllerTest extends WebTestCase
* @var DefaultControllerInterface * @var DefaultControllerInterface
*/ */
protected $defaultController; protected $defaultController;
public function setUp():void{ public function setUp(): void
$this->defaultController = new DefaultController(); {
$this->defaultController = new DefaultController();
} }
public function testHomepage():void{ public function testHomepage(): void
{
$client = static::createClient(); $client = static::createClient();
$client->request('GET', '/'); $client->request('GET', '/');
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertEquals(200, $client->getResponse()->getStatusCode());
} }
public function testImprint():void{ public function testImprint(): void
{
$client = static::createClient(); $client = static::createClient();
$client->request('GET', '/imprint'); $client->request('GET', '/imprint');
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertEquals(200, $client->getResponse()->getStatusCode());
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Tests\Unit\Controller; namespace App\Tests\Unit\Controller;
use App\Controller\UserController; use App\Controller\UserController;
@ -6,41 +7,38 @@ use App\Controller\UserControllerInterface;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class UserControllerTest extends WebTestCase class UserControllerTest extends WebTestCase
{ {
/** /**
*
* @var UserControllerInterface * @var UserControllerInterface
*/ */
protected $userController; protected $userController;
public function setUp():void{ public function setUp(): void
{
$this->userController = new UserController(); $this->userController = new UserController();
} }
public function testLogout(): void public function testLogout(): void
{ {
$client = static::createClient(); $client = static::createClient();
$client->request('GET', '/user/logout'); $client->request('GET', '/user/logout');
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertEquals(200, $client->getResponse()->getStatusCode());
} }
public function testLogin(): void public function testLogin(): void
{ {
$client = static::createClient(); $client = static::createClient();
$client->request('GET', '/login'); $client->request('GET', '/login');
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertEquals(200, $client->getResponse()->getStatusCode());
} }
public function testRegister():void public function testRegister(): void
{ {
$client = static::createClient(); $client = static::createClient();
$client->request('GET', '/user/register'); $client->request('GET', '/user/register');
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertEquals(200, $client->getResponse()->getStatusCode());
} }
} }

View File

@ -1,38 +1,38 @@
<?php <?php
namespace tests\unit\Entity; namespace tests\unit\Entity;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use App\Entity\User; use App\Entity\User;
/** /**
*
* @author kevinfrantz * @author kevinfrantz
*
*/ */
class UserTest extends TestCase class UserTest extends TestCase
{ {
const PASSWORD = '12345678'; const PASSWORD = '12345678';
const USERNAME = 'tester'; const USERNAME = 'tester';
/** /**
*
* @var User * @var User
*/ */
protected $user; protected $user;
public function setUp():void{ public function setUp(): void
{
$this->user = new User(); $this->user = new User();
$this->user->setPassword(self::PASSWORD); $this->user->setPassword(self::PASSWORD);
$this->user->setUsername(' '.self::USERNAME.' '); $this->user->setUsername(' '.self::USERNAME.' ');
} }
public function testUsername():void{ public function testUsername(): void
$this->assertEquals(self::USERNAME,$this->user->getUsername()); {
$this->assertEquals(self::USERNAME, $this->user->getUsername());
} }
public function testPassword():void{ public function testPassword(): void
$this->assertEquals(self::PASSWORD,$this->user->getPassword()); {
$this->assertEquals(self::PASSWORD, $this->user->getPassword());
} }
} }