Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -23,6 +23,7 @@ install:
 
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.xml
+  - vendor/bin/phpcs --standard=PSR2 --colors src tests
 
 after_success:
   - bash <(curl -s https://codecov.io/bash) -f coverage.xml

README.md

@@ -5,7 +5,7 @@
 [![Codecov](https://codecov.io/gh/cycle/orm/graph/badge.svg)](https://codecov.io/gh/cycle/orm)
 <a href="https://discord.gg/TFeEmCs"><img src="https://img.shields.io/badge/discord-chat-magenta.svg"></a>
 
-Cycle is PHP DataMapper ORM and Data Modelling engine designed to safely work in classic and daemonized PHP applications (like [RoadRunner](https://github.com/spiral/roadrunner)). The ORM provides flexible configuration options to model datasets and support dynamic mapping schema at runtime. Engine can work with plain PHP objects, support annotation declarations and proxies via extensions.
+Cycle is PHP DataMapper ORM and Data Modelling engine designed to safely work in classic and daemonized PHP applications (like [RoadRunner](https://github.com/spiral/roadrunner)). The ORM provides flexible configuration options to model datasets and supports dynamic mapping schema at runtime. The engine can work with plain PHP objects, support annotation declarations, and proxies via extensions.
 
 <p align="center">
 	<a href="https://github.com/cycle/docs"><b>Documentation</b></a> | <a href="https://github.com/cycle/docs/issues/3">Comparison with Eloquent and Doctrine</a>
@@ -14,20 +14,20 @@ Cycle is PHP DataMapper ORM and Data Modelling engine designed to safely work in
 Features:
 ---------
 - ORM with has-one, has-many, many-thought-many and polymorphic relations
-- Plain Old PHP Objects or [same entity type for multiple repositories](tests/ORM/Classless)
+- Plain Old PHP objects, [AR](https://github.com/cycle/docs/blob/master/advanced/active-record.md), Custom objects or [same entity type for multiple repositories](tests/ORM/Classless)
 - eager and lazy loading, query builder with multiple fetch strategies
 - embedded entities, lazy/eager loaded embedded partials
 - runtime configuration with/without code-generation
 - column-to-field mapping, single table inheritance, value objects support
 - custom persist strategies, dirty state, safe entity map
 - works with directed graphs and cyclic graphs using command chains
-- designed to work in long-running applications, immutable service core, reconnects
+- designed to work in long-running applications, immutable service core
 - supports MySQL, MariaDB, PostgresSQL, SQLServer, SQLite
-- schema scaffolding and migrations
+- schema scaffolding, introspection, and migrations
 - supports global query constrains, UUIDs as PK, soft deletes, auto timestamps
-- disposable UoW, custom column types, FKs to non primary columns
-- use with or without annotations, proxy classes and auto-migrations 
-- compatible with Doctrine Collections, Doctrine Annotations and Zend Hydrator
+- disposable UoW, custom column types, FKs to non-primary columns
+- use with or without annotations, proxy classes, and auto-migrations 
+- compatible with Doctrine Collections, Doctrine Annotations, and Zend Hydrator
 
 Extensions:
 ---------
@@ -41,4 +41,3 @@ cycle/migrations | [![Latest Stable Version](https://poser.pugx.org/cycle/migrat
 License:
 --------
 The MIT License (MIT). Please see [`LICENSE`](./LICENSE) for more information. Maintained by [Spiral Scout](https://spiralscout.com).
-

composer.json

@@ -17,7 +17,8 @@
     "phpunit/phpunit": "~7.0",
     "mockery/mockery": "^1.1",
     "spiral/debug": "^1.3",
-    "ramsey/uuid": "^3.8"
+    "ramsey/uuid": "^3.8",
+    "squizlabs/php_codesniffer": "^3.4"
   },
   "autoload": {
     "psr-4": {

src/Command/Branch/Condition.php

@@ -86,4 +86,4 @@ public function rollBack()
     {
         // nothing to do
     }
-}
+}

src/Command/Branch/ContextSequence.php

@@ -161,4 +161,4 @@ public function rollBack()
     {
         // nothing
     }
-}
+}

src/Command/Branch/Nil.php

@@ -22,7 +22,6 @@ final class Nil implements ContextCarrierInterface
      */
     public function waitContext(string $key, bool $required = true)
     {
-
     }
 
     /**
@@ -80,4 +79,4 @@ public function rollBack()
     {
         // nothing to do
     }
-}
+}

src/Command/Branch/Sequence.php

@@ -104,4 +104,4 @@ public function rollBack()
     {
         // nothing
     }
-}
+}

src/Command/Branch/Split.php

@@ -12,7 +12,8 @@
 use Cycle\ORM\Command\ContextCarrierInterface;
 
 /**
- * Splits input context command into 2 destinations: original create command (usually insert) and delayed update command.
+ * Splits input context command into 2 destinations:
+ * original create command (usually insert) and delayed update command.
  * Used to properly unfold cyclic graphs by keeping the reference data in update and solves the issue of multiple
  * parent by sending the data to the first command.
  *
@@ -139,4 +140,4 @@ protected function getTarget(): ContextCarrierInterface
 
         return $this->tail;
     }
-}
+}

src/Command/CommandInterface.php

@@ -47,4 +47,4 @@ public function complete();
      * Rollback command or declare that command been rolled back.
      */
     public function rollBack();
-}
+}

src/Command/ContextCarrierInterface.php

@@ -29,4 +29,4 @@ public function waitContext(string $key, bool $required = true);
      * @return array
      */
     public function getContext(): array;
-}
+}

src/Command/Database/Delete.php

@@ -67,4 +67,4 @@ public function register(
 
         $this->setScope($key, $value);
     }
-}
+}

src/Command/Database/Insert.php

@@ -125,4 +125,4 @@ public function execute()
 
         parent::execute();
     }
-}
+}

src/Command/Database/Update.php

@@ -142,4 +142,4 @@ public function registerAppendix(string $key, $value)
     {
         $this->appendix[$key] = $value;
     }
-}
+}

src/Command/DatabaseCommand.php

@@ -71,4 +71,4 @@ public function rollBack()
     {
         // nothing to do
     }
-}
+}

src/Command/InitCarrierInterface.php

@@ -20,5 +20,4 @@
  */
 interface InitCarrierInterface extends ContextCarrierInterface
 {
-
-}
+}

src/Command/ScopeCarrierInterface.php

@@ -27,4 +27,4 @@ public function waitScope(string $key);
      * @return array
      */
     public function getScope(): array;
-}
+}

src/Command/Traits/ContextTrait.php

@@ -59,4 +59,4 @@ protected function freeContext(string $key)
     {
         unset($this->waitContext[$key]);
     }
-}
+}

src/Command/Traits/ErrorTrait.php

@@ -29,4 +29,4 @@ public function __toError()
 
         return sprintf("%s(%s)", get_class($this), join(", ", $missing));
     }
-}
+}

src/Command/Traits/ScopeTrait.php

@@ -55,4 +55,4 @@ protected function freeScope(string $key)
     {
         unset($this->waitScope[$key]);
     }
-}
+}

src/Config/RelationConfig.php

@@ -95,4 +95,4 @@ public static function getDefault()
             ]
         ]);
     }
-}
+}

src/Context/ConsumerInterface.php

@@ -34,4 +34,4 @@ public function register(
         bool $fresh = false,
         int $stream = self::DATA
     );
-}
+}

src/Context/ProducerInterface.php

@@ -31,4 +31,4 @@ public function forward(
         bool $trigger = false,
         int $stream = ConsumerInterface::DATA
     );
-}
+}

src/Exception/Annotation/AnnotationException.php

@@ -9,8 +9,6 @@
 
 namespace Cycle\ORM\Exception\Annotation;
 
-
 class AnnotationException extends \RuntimeException
 {
-
-}
+}

src/Exception/BuilderException.php

@@ -11,5 +11,4 @@
 
 class BuilderException extends ORMException
 {
-
-}
+}

src/Exception/CommandException.php

@@ -11,5 +11,4 @@
 
 class CommandException extends ORMException
 {
-
-}
+}

src/Exception/ConfigException.php

@@ -11,5 +11,4 @@
 
 class ConfigException extends ORMException
 {
-
-}
+}

src/Exception/FactoryException.php

@@ -11,4 +11,4 @@
 
 class FactoryException extends ORMException
 {
-}
+}

src/Exception/HeapException.php

@@ -11,5 +11,4 @@
 
 class HeapException extends \Exception
 {
-
-}
+}

src/Exception/LoaderException.php

@@ -11,5 +11,4 @@
 
 class LoaderException extends ORMException
 {
-
-}
+}

src/Exception/MapperException.php

@@ -11,5 +11,4 @@
 
 class MapperException extends ORMException
 {
-
-}
+}

src/Exception/ORMException.php

@@ -11,5 +11,4 @@
 
 class ORMException extends \RuntimeException
 {
-
-}
+}

src/Exception/ParserException.php

@@ -11,5 +11,4 @@
 
 class ParserException extends ORMException
 {
-
-}
+}

src/Exception/PromiseException.php

@@ -11,5 +11,4 @@
 
 class PromiseException extends ORMException
 {
-
-}
+}

src/Exception/Relation/NullException.php

@@ -13,5 +13,4 @@
 
 class NullException extends RelationException
 {
-
-}
+}

src/Exception/RelationException.php

@@ -11,5 +11,4 @@
 
 class RelationException extends ORMException
 {
-
-}
+}

src/Exception/SchemaException.php

@@ -11,5 +11,4 @@
 
 class SchemaException extends ORMException
 {
-
-}
+}

src/Exception/SelectorException.php

@@ -11,5 +11,4 @@
 
 class SelectorException extends ORMException
 {
-
-}
+}

src/Exception/TransactionException.php

@@ -11,5 +11,4 @@
 
 class TransactionException extends ORMException
 {
-
-}
+}

src/Exception/TypecastException.php

@@ -11,5 +11,4 @@
 
 class TypecastException extends ORMException
 {
-
-}
+}

src/Factory.php

@@ -122,4 +122,4 @@ public function database(string $database = null): DatabaseInterface
     {
         return $this->dbal->database($database);
     }
-}
+}

src/FactoryInterface.php

@@ -64,4 +64,4 @@ public function relation(
         string $role,
         string $relation
     ): RelationInterface;
-}
+}

src/Heap/Heap.php

@@ -122,4 +122,4 @@ public function __destruct()
     {
         $this->clean();
     }
-}
+}

src/Heap/HeapInterface.php

@@ -60,4 +60,4 @@ public function detach($entity);
      * Detach all objects from the heap.
      */
     public function clean();
-}
+}

src/Heap/Node.php

@@ -200,4 +200,4 @@ private static function compare($a, $b): int
 
         return ($a > $b) ? 1 : -1;
     }
-}
+}

src/Heap/State.php

@@ -173,4 +173,4 @@ public function register(
             }
         }
     }
-}
+}

src/Heap/Traits/ClaimTrait.php

@@ -42,4 +42,4 @@ public function hasClaims(): bool
     {
         return $this->numClaims > 0;
     }
-}
+}