From 0fcc6dc8b7e2662a45e9a56bfd4e255a75857e71 Mon Sep 17 00:00:00 2001 From: Basilius Sauter Date: Thu, 27 Jun 2019 09:30:05 +0200 Subject: [PATCH] Automatic PHP CS Fixer run. --- .php_cs.dist | 2 ++ src/Models/Character.php | 6 +++--- src/Models/MessageThread.php | 2 +- src/Models/Scene.php | 2 +- src/Models/SceneConnection.php | 2 +- src/Models/SceneTemplate.php | 18 ++++++++---------- src/Models/Viewpoint.php | 2 +- src/SceneTemplates/BasicSceneTemplate.php | 6 ++---- src/SceneTemplates/SceneTemplateInterface.php | 4 +--- src/Tools/Model/SceneBasics.php | 6 +++--- 10 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.php_cs.dist b/.php_cs.dist index 0e97282..16a401c 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -25,6 +25,8 @@ return PhpCsFixer\Config::create() 'doctrine_annotation_braces' => true, 'doctrine_annotation_indentation' => true, 'doctrine_annotation_spaces' => [ + 'after_array_assignments_colon' => false, + 'after_array_assignments_equals' => false, 'before_argument_assignments' => false, 'before_array_assignments_colon' => false, 'before_array_assignments_equals' => false, diff --git a/src/Models/Character.php b/src/Models/Character.php index 1b50ebc..21bf968 100644 --- a/src/Models/Character.php +++ b/src/Models/Character.php @@ -47,11 +47,11 @@ class Character implements CharacterInterface, CreateableInterface, GameAwareInt private $name = ""; /** @Column(type="text"); */ private $displayName = ""; - /** @Column(type="integer", options={"default"= 10}) */ + /** @Column(type="integer", options={"default"=10}) */ private $maxHealth = 10; - /** @Column(type="integer", options={"default"= 10}) */ + /** @Column(type="integer", options={"default"=10}) */ private $health = 10; - /** @Column(type="integer", options={"default"= 1})/ */ + /** @Column(type="integer", options={"default"=1})/ */ private $level = 1; /** @OneToMany(targetEntity="CharacterProperty", mappedBy="owner", cascade={"persist", "remove"}) */ private $properties; diff --git a/src/Models/MessageThread.php b/src/Models/MessageThread.php index a889bd3..665b0b2 100644 --- a/src/Models/MessageThread.php +++ b/src/Models/MessageThread.php @@ -26,7 +26,7 @@ class MessageThread implements SaveableInterface private $id; /** @Column(type="string", length=255, unique=true) */ private $threadKey; - /** @Column(type="boolean", options={"default"= false}) */ + /** @Column(type="boolean", options={"default"=false}) */ private $readonly = false; /** @ManyToMany(targetEntity="Character", cascade={"persist"}, mappedBy="messageThreads") */ private $participants; diff --git a/src/Models/Scene.php b/src/Models/Scene.php index 83a0cde..fa23b6d 100644 --- a/src/Models/Scene.php +++ b/src/Models/Scene.php @@ -27,7 +27,7 @@ class Scene implements CreateableInterface, SceneConnectable use Deletor; use SceneBasics; - /** @Id @Column(type="string", length=36, unique=True, name="id", options={"fixed": true}) */ + /** @Id @Column(type="string", length=36, unique=True, name="id", options={"fixed"=true}) */ protected $id; /** diff --git a/src/Models/SceneConnection.php b/src/Models/SceneConnection.php index ffe6763..9b74252 100644 --- a/src/Models/SceneConnection.php +++ b/src/Models/SceneConnection.php @@ -28,7 +28,7 @@ class SceneConnection private $incomingScene; /** - * @Column(type="integer", options={"default"= 0}) + * @Column(type="integer", options={"default"=0}) */ private $directionality = 0; diff --git a/src/Models/SceneTemplate.php b/src/Models/SceneTemplate.php index 7ebe228..57b8427 100644 --- a/src/Models/SceneTemplate.php +++ b/src/Models/SceneTemplate.php @@ -1,20 +1,18 @@ userAssignable=$flag; + $this->userAssignable = $flag; } -} \ No newline at end of file +} diff --git a/src/Models/Viewpoint.php b/src/Models/Viewpoint.php index 9df7c21..1878c0e 100644 --- a/src/Models/Viewpoint.php +++ b/src/Models/Viewpoint.php @@ -141,7 +141,7 @@ class Viewpoint implements CreateableInterface $snapshot = new ViewpointSnapshot( $this->getTitle(), $this->getDescription(), - get_class($this->getTemplate()), + \get_class($this->getTemplate()), $this->getActionGroups(), $this->getAttachments(), $this->getData() diff --git a/src/SceneTemplates/BasicSceneTemplate.php b/src/SceneTemplates/BasicSceneTemplate.php index ba60fd5..72f9b20 100644 --- a/src/SceneTemplates/BasicSceneTemplate.php +++ b/src/SceneTemplates/BasicSceneTemplate.php @@ -1,12 +1,10 @@