Fix styling issues

Riimu · Riimu · commit 064b2873c9e1 · 2018-10-05T16:59:43.000+03:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,11 @@
+# Make sure line endings are normalized to LF for Windows
+* text eol=lf
+
+# Remove developer files from exports
+tests export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.php_cs export-ignore
+.travis.yml export-ignore
+phpunit.xml export-ignore
+sami_config.php export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 build/
 vendor/
 composer.lock
+infection.json.dist
+infection-log.txt
 psalm.xml
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,3 @@
+<?php
+
+return require __DIR__ . '/vendor/riimu/php-cs-fixer-config/config.php';
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,30 @@
+language: php
+sudo: false
+
+php:
+  - 7.2
+
+cache:
+  directories:
+    - build/.composer-cache
+
+before_install:
+  - export COMPOSER_CACHE_DIR="$(pwd)/build/.composer-cache"
+  - export XDEBUG="/home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini"
+  - mv -v "$XDEBUG" "$XDEBUG.disabled"
+
+install:
+  - mkdir -p build/php_codesniffer build/php-cs-fixer build/ocular
+  - composer require --no-suggest --no-progress -n -a -d build/php-cs-fixer "friendsofphp/php-cs-fixer:^2.13"
+  - composer require --no-suggest --no-progress -n -a -d build/php_codesniffer "squizlabs/php_codesniffer:^3.3"
+  - composer require --no-suggest --no-progress -n -a -d build/ocular "scrutinizer/ocular:^1.5"
+  - composer update --no-suggest --no-progress -n -a
+
+script:
+  - build/php_codesniffer/vendor/bin/phpcs -p --standard=PSR2 src tests
+  - build/php-cs-fixer/vendor/bin/php-cs-fixer fix -v --dry-run --allow-risky=yes --using-cache=no
+  - mv -v "$XDEBUG.disabled" "$XDEBUG"
+  - vendor/bin/phpunit --coverage-clover=build/coverage.clover --coverage-text
+
+after_script:
+  - build/ocular/vendor/bin/ocular code-coverage:upload --format=php-clover build/coverage.clover
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 2018 Riikka Kalliomäki
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/composer.json b/composer.json
@@ -22,8 +22,8 @@
   },
   "require-dev": {
     "simply/container": "^0.2.1",
-    "phpunit/phpunit": "^7.2",
-    "riimu/php-cs-fixer-config": "^0.1.0",
+    "phpunit/phpunit": "^7.4",
+    "riimu/php-cs-fixer-config": "^0.1.1",
     "riimu/sami-config": "^0.1.0"
   },
   "autoload": {
diff --git a/sami_config.php b/sami_config.php
@@ -0,0 +1,3 @@
+<?php
+
+return require __DIR__ . '/vendor/riimu/sami-config/config.php';
diff --git a/src/Connection/Connection.php b/src/Connection/Connection.php
@@ -26,7 +26,7 @@ public function getConnection(): \PDO;
      * Inserts a row the database with given column values.
      * @param string $table Name of the table to insert
      * @param array $values Associative array of column values for the insert
-     * @param string|null $primaryKey Name of automatic primary key column that will be overwritten with its value.
+     * @param string|null $primaryKey Name of automatic primary key column that will be overwritten with its value
      * @return \PDOStatement The resulting PDO statement after executing the query
      */
     public function insert(string $table, array $values, & $primaryKey = null): \PDOStatement;
diff --git a/src/Connection/MySqlConnection.php b/src/Connection/MySqlConnection.php
@@ -69,7 +69,7 @@ public function update(string $table, array $values, array $where): \PDOStatemen
         return $this->query($this->formatQuery([
             'UPDATE' => $this->formatTable($table),
             'SET' => $this->formatAssignments($values, $parameters),
-            'WHERE' => $this->formatConditions($where, $parameters)
+            'WHERE' => $this->formatConditions($where, $parameters),
         ]), $parameters);
     }
 
@@ -308,7 +308,7 @@ public function query(string $sql, array $parameters = []): \PDOStatement
     }
 
     /**
-     * Binds an SQL query parameter to the PDO statement fo the query
+     * Binds an SQL query parameter to the PDO statement fo the query.
      * @param \PDOStatement $query The PDO statement for binding the value
      * @param int|string $name The name of the placeholder
      * @param mixed $value The value to bind
diff --git a/src/Connection/Provider/GenericConnectionProvider.php b/src/Connection/Provider/GenericConnectionProvider.php
@@ -51,7 +51,7 @@ public function getConnection(): \PDO
 
     /**
      * Initializes the PDO connection when first requested.
-     * @return \PDO The initialized PDO connection.
+     * @return \PDO The initialized PDO connection
      */
     protected function initializeConnection(): \PDO
     {
diff --git a/src/Model.php b/src/Model.php
@@ -27,7 +27,7 @@ protected function __construct(Record $record)
      * @param Record $record The database record for the model
      * @return Model A new initialized model with the given database record
      */
-    public static function createFromDatabaseRecord(Record $record): Model
+    public static function createFromDatabaseRecord(Record $record): self
     {
         /** @var Model $model */
         $model = (new \ReflectionClass(static::class))->newInstanceWithoutConstructor();
diff --git a/src/Query.php b/src/Query.php
@@ -43,7 +43,7 @@ public function __construct(Connection $connection, string $sql)
      * @param string $alias Alias to use for the table in the query
      * @return Query A new query object with the given schema
      */
-    public function withSchema(Schema $schema, string $alias = ''): Query
+    public function withSchema(Schema $schema, string $alias = ''): self
     {
         $query = clone $this;
         $query->schemas[$this->formatAlias($alias)] = $schema;
@@ -56,7 +56,7 @@ public function withSchema(Schema $schema, string $alias = ''): Query
      * @param array $parameters The list of parameters to add
      * @return Query A new query object with the given parameters
      */
-    public function withParameters(array $parameters): Query
+    public function withParameters(array $parameters): self
     {
         $query = clone $this;
 
@@ -76,7 +76,7 @@ public function withParameters(array $parameters): Query
      * Returns a new query object without any schemas.
      * @return Query A new query object without any attached schemas
      */
-    public function withoutSchemas(): Query
+    public function withoutSchemas(): self
     {
         $query = clone $this;
         $query->schemas = [];
@@ -88,7 +88,7 @@ public function withoutSchemas(): Query
      * Returns a new query object without any inserted parameters.
      * @return Query A new query object without any inserted parameters
      */
-    public function withoutParameters(): Query
+    public function withoutParameters(): self
     {
         $query = clone $this;
         $query->parameters = [];
diff --git a/src/Record.php b/src/Record.php
@@ -27,7 +27,7 @@ class Record implements \ArrayAccess
     /** @var array The primary key for the record at the time of retrieving */
     private $primaryKey;
 
-    /** @var array Values for the record fields*/
+    /** @var array Values for the record fields */
     private $values;
 
     /** @var bool[] Associative list of fields for the record that have been modified */
@@ -171,7 +171,7 @@ public function setReferencedRecords(string $name, array $records): void
     {
         $name = $this->getSchema()->getRelationship($name)->getName();
 
-        (function (Record ... $records) use ($name): void {
+        (function (self ... $records) use ($name): void {
             $this->referencedRecords[$name] = $records;
         })(... $records);
     }
@@ -250,7 +250,7 @@ public function addAssociation(string $name, Model $model): void
     }
 
     /**
-     * Returns the model of the referenced record in a unique relationship
+     * Returns the model of the referenced record in a unique relationship.
      * @param string $name Name of the relationship
      * @return Model|null The referenced model, or null if no model is referenced by this record
      */
@@ -351,7 +351,6 @@ public function getAllReferencedRecords(): array
         return array_values($records);
     }
 
-
     /**
      * Sets the values for the fields in the record loaded from the database.
      * @param array $row Value for the fields in this record
diff --git a/src/Relationship.php b/src/Relationship.php
@@ -132,7 +132,7 @@ public function isUniqueRelationship(): bool
      * Returns the reverse relationship.
      * @return Relationship The reverse relationship
      */
-    public function getReverseRelationship(): Relationship
+    public function getReverseRelationship(): self
     {
         if ($this->reverse === null) {
             $this->reverse = $this->detectReverseRelationship();
@@ -145,21 +145,17 @@ public function getReverseRelationship(): Relationship
      * Detects the reverse relationship in the referenced schema.
      * @return Relationship The reverse relationship in the referenced schema
      */
-    private function detectReverseRelationship(): Relationship
+    private function detectReverseRelationship(): self
     {
         $reverse = array_filter(
             $this->referencedSchema->getRelationships(),
-            function (Relationship $relationship): bool {
+            function (self $relationship): bool {
                 return $this->isReverseRelationship($relationship);
             }
         );
 
         if (\count($reverse) !== 1) {
-            if (\count($reverse) > 1) {
-                throw new InvalidRelationshipException('Multiple reverse relationship exists for this relationship');
-            }
-
-            throw new InvalidRelationshipException('No reverse relationship exists for this relationship');
+            throw new InvalidRelationshipException('Could not find a valid reverse relationship');
         }
 
         return array_pop($reverse);
@@ -168,9 +164,9 @@ function (Relationship $relationship): bool {
     /**
      * Tells if the given relationship is a reverse relationship to this relationship.
      * @param Relationship $relationship The relationship to test
-     * @return bool True if the given relationship is a reverse relatinoship, false if not
+     * @return bool True if the given relationship is a reverse relationship, false if not
      */
-    private function isReverseRelationship(Relationship $relationship): bool
+    private function isReverseRelationship(self $relationship): bool
     {
         return $relationship->getSchema() === $this->getReferencedSchema()
             && $relationship->getReferencedSchema() === $this->getSchema()
diff --git a/src/Repository.php b/src/Repository.php
@@ -48,7 +48,7 @@ protected function find(Schema $schema, array $conditions, array $order = [], in
     }
 
     /**
-     * Returns a single model based on the given conditions
+     * Returns a single model based on the given conditions.
      * @param Schema $schema The schema of the record to select
      * @param array $conditions Conditions for the select query
      * @param array $order The order for the select query
diff --git a/src/Schema.php b/src/Schema.php
@@ -31,7 +31,7 @@ public function __construct(ContainerInterface $container)
 
     /**
      * Returns the model class used to operate on the records from this schema.
-     * @return string The model class used to operate on the records from this schema.
+     * @return string The model class used to operate on the records from this schema
      */
     abstract public function getModel(): string;
 
@@ -122,7 +122,7 @@ public function getRelationship(string $name): Relationship
      * @param string $name Name of the schema
      * @return Schema The schema loaded from the container
      */
-    private function loadSchema(string $name): Schema
+    private function loadSchema(string $name): self
     {
         return $this->container->get($name);
     }
diff --git a/src/StaticSchema.php b/src/StaticSchema.php
@@ -13,7 +13,7 @@ abstract class StaticSchema extends Schema
     /** @var string The model class for models associated to the records */
     protected static $model = '';
 
-    /** @var string The name of the table for the schema*/
+    /** @var string The name of the table for the schema */
     protected static $table = '';
 
     /** @var string[]|string The primary key field or list of fields the make up the composite primary key */
diff --git a/tests/helpers/TestCase/IntegrationTestCase.php b/tests/helpers/TestCase/IntegrationTestCase.php
@@ -2,8 +2,6 @@
 
 namespace Simply\Database\Test\TestCase;
 
-use PHPUnit\Framework\TestCase;
-use Simply\Container\Container;
 use Simply\Database\Connection\Connection;
 use Simply\Database\Exception\MissingRecordException;
 use Simply\Database\Test\TestHouseSchema;
diff --git a/tests/helpers/TestPersonModel.php b/tests/helpers/TestPersonModel.php
@@ -81,18 +81,18 @@ public function getChildren(): array
         return $this->record->getRelatedModelsByProxy('children', 'child');
     }
 
-    public function marry(TestPersonModel $person): void
+    public function marry(self $person): void
     {
         $this->record->associate('spouse', $person);
         $person->record->associate('spouse', $this);
     }
 
-    public function getSpouse(): ?TestPersonModel
+    public function getSpouse(): ?self
     {
         return $this->record->getRelatedModel('spouse');
     }
 
-    public function getHome(): TestHouseModel
+    public function getHome(): self
     {
         return $this->record->getRelatedModel('home');
     }
diff --git a/tests/helpers/TestPersonSchema.php b/tests/helpers/TestPersonSchema.php
@@ -23,28 +23,28 @@ class TestPersonSchema extends StaticSchema
     protected static $relationships = [
         'parents' => [
             'key' => 'id',
-            'schema' => TestParentSchema::class,
+            'schema' => self::class,
             'field' => 'child_id',
         ],
         'children' => [
             'key' => 'id',
-            'schema' => TestParentSchema::class,
+            'schema' => self::class,
             'field' => 'parent_id',
         ],
         'spouse' => [
             'key' => 'spouse_id',
-            'schema' => TestPersonSchema::class,
+            'schema' => self::class,
             'field' => 'id',
         ],
         'spouse_reverse' => [
             'key' => 'id',
-            'schema' => TestPersonSchema::class,
+            'schema' => self::class,
             'field' => 'spouse_id',
             'unique' => true,
         ],
         'home' => [
             'key' => 'home_id',
-            'schema' => TestHouseSchema::class,
+            'schema' => self::class,
             'field' => 'id',
         ],
     ];
diff --git a/tests/tests/QueryTest.php b/tests/tests/QueryTest.php
@@ -17,7 +17,7 @@ class QueryTest extends UnitTestCase
 {
     public function testGenerateFromInvalidSchema(): void
     {
-        $query = $this->getQuery('', []);
+        $query = $this->getQuery('SELECT {fields} FROM {table}', []);
 
         $query = $query->withSchema($this->getPersonSchema(), 'person');
         $query = $query->withoutSchemas();
@@ -26,6 +26,16 @@ public function testGenerateFromInvalidSchema(): void
         $query->fetchModels('person');
     }
 
+    public function testInvalidSchemaAliasOnGenerate(): void
+    {
+        $query = $this->getQuery('SELECT {fields} FROM {table}', []);
+
+        $query = $query->withSchema($this->getPersonSchema(), 'person');
+
+        $this->expectException(\InvalidArgumentException::class);
+        $query->fetchModels('home');
+    }
+
     public function testGenerateFromOneSchema(): void
     {
         $data = [['h_id' => 1, 'h_street' => 'Street Name']];
@@ -39,6 +49,16 @@ public function testGenerateFromOneSchema(): void
         $this->assertSame('Street Name', $houses[0]->getStreet());
     }
 
+    public function testGenerateRows(): void
+    {
+        $data = [['id' => 1], ['id' => 2]];
+        $rows = $this->getQuery('SELECT id FROM {table}', $data)
+            ->withSchema($this->getPersonSchema())
+            ->generateRows();
+
+        $this->assertSame([['id' => 1], ['id' => 2]], iterator_to_array($rows));
+    }
+
     public function testFetchCallback(): void
     {
         $data = [['age' => '5'], ['age' => '3']];
diff --git a/tests/tests/RecordTest.php b/tests/tests/RecordTest.php
diff --git a/tests/tests/SchemaTest.php b/tests/tests/SchemaTest.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+return require __DIR__ . '/vendor/riimu/php-cs-fixer-config/config.php';`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getConnection(): \PDO`
`51`	`51`
`52`	`52`	`/**`
`53`	`53`	`* Initializes the PDO connection when first requested.`
`54`		`- * @return \PDO The initialized PDO connection.`
	`54`	`+ * @return \PDO The initialized PDO connection`
`55`	`55`	`*/`
`56`	`56`	`protected function initializeConnection(): \PDO`
`57`	`57`	`{`