Merge branch 'master' into develop

spiral-modules · Nov 23, 2017 · 5399f5d · 5399f5d
2 parents aebc8d5 + 6066859
commit 5399f5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -12,10 +12,10 @@
   "require": {
     "php": ">=7.0",
     "psr/simple-cache": "^1.0",
-    "spiral/common": "^0.9",
-    "spiral/models": "^0.9",
-    "spiral/tokenizer": "^0.9",
-    "spiral/database": "^0.9",
+    "spiral/common": "^1.0",
+    "spiral/models": "^1.0",
+    "spiral/tokenizer": "^1.0.0",
+    "spiral/database": "^1.0",
     "doctrine/inflector": "^1.1"
   },
   "require-dev": {

diff --git a/source/Spiral/ORM/Schemas/Definitions/RelationContext.php b/source/Spiral/ORM/Schemas/Definitions/RelationContext.php
@@ -120,12 +120,12 @@ public function getPrimary(): ColumnInterface
      *
      * @return AbstractColumn
      */
-    public function getColumn($name): AbstractColumn
+    public function getColumn(string $name): AbstractColumn
     {
         if (!$this->schema->hasColumn($name)) {
             throw new DefinitionException("Undefined column {$name} in {$this->schema->getName()}");
         }
 
         return clone $this->schema->column($name);
     }
-}
+}