From 796536def0a0008f39e4a73bfa35146423b7172d Mon Sep 17 00:00:00 2001 From: David Drurika Date: Thu, 27 Sep 2012 07:19:33 +0200 Subject: [PATCH 1/7] preklep --- Ndab/Manager.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Ndab/Manager.php b/Ndab/Manager.php index 2a39d69..7e58fb2 100644 --- a/Ndab/Manager.php +++ b/Ndab/Manager.php @@ -93,13 +93,13 @@ public function getAll($conds = array()) /** - * Returns row identified by $privaryValue - * @param mixed $privaryValue + * Returns row identified by $primaryValue + * @param mixed $primaryValue * @return Entity */ - public function get($privaryValue) + public function get($primaryValue) { - return $this->table()->get($privaryValue); + return $this->table()->get($primaryValue); } From 756aa7d6021fdbbb1237f3504b8ff45717b07d81 Mon Sep 17 00:00:00 2001 From: David Drurika Date: Thu, 27 Sep 2012 07:45:46 +0200 Subject: [PATCH 2/7] zle poradie argumentov do NDB\Selection --- Ndab/Selection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ndab/Selection.php b/Ndab/Selection.php index 45fb8aa..31021cb 100644 --- a/Ndab/Selection.php +++ b/Ndab/Selection.php @@ -42,7 +42,7 @@ class Selection extends Table\Selection */ public function __construct(Nette\Database\Connection $connection, $table, Manager $manager) { - parent::__construct($connection, $this->table = $table); + parent::__construct($this->table = $table, $connection); $this->manager = $manager; } From 7fdbb0743f8aef4ea61b58a694834ca05f55b71c Mon Sep 17 00:00:00 2001 From: David Drurika Date: Thu, 27 Sep 2012 17:12:11 +0200 Subject: [PATCH 3/7] savesave --- composer.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3164c1e..09523f0 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "ndab/ndab", + "name": "achtan/ndab", "description": "Ndab - ORM builded on Nette\\Database.", "keywords": ["nette", "database", "orm", "db"], "homepage": "https://github.com/hrach/ndab", @@ -9,13 +9,19 @@ "name": "Jan Skrasek", "email": "jan@skrasek.com", "homepage": "http://jan.skrasek.com" + }, + { + "name": "David Durika", + "email": "david@durika.com", + "homepage": "http://durika.com" } + ], "autoload": { "psr-0": { "Ndab": "" } }, "require": { "php": ">=5.3.2", - "nette/nette": "dev-master" + "nette/nette": "dev-master / 2.1.x-dev" } } From bd4a21615dcd8dc941d11fce1f333d9f2dbde40d Mon Sep 17 00:00:00 2001 From: David Drurika Date: Thu, 27 Sep 2012 17:19:28 +0200 Subject: [PATCH 4/7] save --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 09523f0..b907dd6 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ }, { "name": "David Durika", - "email": "david@durika.com", - "homepage": "http://durika.com" + "email": "david@durika.sk", + "homepage": "http://durika.sk" } ], @@ -22,6 +22,6 @@ }, "require": { "php": ">=5.3.2", - "nette/nette": "dev-master / 2.1.x-dev" + "nette/nette": "dev-devel" } } From c98889f6cfbb2ad7c7b9ce04afe1b20a54b76c87 Mon Sep 17 00:00:00 2001 From: David Drurika Date: Thu, 27 Sep 2012 17:21:03 +0200 Subject: [PATCH 5/7] save --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b907dd6..cafd998 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,6 @@ }, "require": { "php": ">=5.3.2", - "nette/nette": "dev-devel" + "nette/nette": "2.1.x-dev" } } From aa2b931b49f7e7f65491330d356bd26584db107f Mon Sep 17 00:00:00 2001 From: David Drurika Date: Thu, 27 Sep 2012 18:54:13 +0200 Subject: [PATCH 6/7] save --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index cafd998..7ab2d2f 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,5 @@ }, "require": { "php": ">=5.3.2", - "nette/nette": "2.1.x-dev" } } From f7ab9022f785cfea12036b61cccebcee6ab74965 Mon Sep 17 00:00:00 2001 From: David Drurika Date: Thu, 27 Sep 2012 18:55:49 +0200 Subject: [PATCH 7/7] save --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7ab2d2f..4c57394 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,6 @@ "psr-0": { "Ndab": "" } }, "require": { - "php": ">=5.3.2", + "php": ">=5.3.2" } }