diff --git a/README.md b/README.md index 78cbfcf..e80d5fb 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ composer require "yeosz/dtool" $provider = new \Yeosz\Dtool\Provider(); $data = [ + 'string' => $provider->getString(10), + 'mb_string' => $provider->getMbString(10), + 'city' => $provider->city, 'address' => $provider->address, 'uuid' => $provider->uuid, 'id_card' => $provider->id_card, @@ -79,7 +82,7 @@ $sql = "CREATE TABLE `dtool_test` ( $db->query($sql); $rows = $db->query("select * from dtool_test where " . $db->buildInCondition('id', [1,2,3,4], true) . " order by id desc"); -print_r($row); +print_r($rows); $row = $db->row("select id,name from dtool_test where id=:id", ['id'=>1]); print_r($row); diff --git a/examples/test.php b/examples/test.php index dea286d..af21d94 100644 --- a/examples/test.php +++ b/examples/test.php @@ -5,6 +5,9 @@ $provider = new \Yeosz\Dtool\Provider(); $data = [ + 'string' => $provider->getString(10), + 'mb_string' => $provider->getMbString(10), + 'city' => $provider->city, 'address' => $provider->address, 'uuid' => $provider->uuid, 'id_card' => $provider->id_card, @@ -27,10 +30,11 @@ 'time' => $provider->time, 'integer' => $provider->integer, 'random' => $provider->randomValue([1, 2, 3]), + 'payment' => $provider->payment, + 'bank' => $provider->bank, ]; -print_r($data); -$provider->addIncrement('sort', 1); +$provider->addIncrement('sort', 1); var_dump($provider->sort); var_dump($provider->sort); var_dump($provider->sort); @@ -39,8 +43,9 @@ return time(); }); var_dump($provider->my_time); + die; -//$db = new Yeosz\Dtool\DB('localhost;port=3306', 'dtool', 'root', ''); + $db = new Yeosz\Dtool\DB('localhost;port=33060', 'homestead', 'homestead', 'secret'); diff --git a/src/Provider.php b/src/Provider.php index 231a8ac..283e328 100644 --- a/src/Provider.php +++ b/src/Provider.php @@ -17,6 +17,7 @@ * @property string bitmap_url * @property string company_name * @property string id_card + * @property string city * @property string address * @property string datetime * @property string timestamp @@ -68,6 +69,7 @@ class Provider 'company_name' => 'getCompanyName', 'id_card' => 'getIdCard', 'address' => 'getAddress', + 'city' => 'getCity', 'uuid' => 'getUuid', 'ip' => 'getIp', 'ean8' => 'getEan8', @@ -427,6 +429,7 @@ public function getCity() $ids[$area['id']] = $area['id']; } } + $ids = array_diff($ids, [110100, 120100, 139000, 419000, 429000, 469000, 500100, 500200, 659000]); $id = $this->randomValue($ids); return $regions[$id]; }