Modified app/Models/City.php

Modified app/Models/Country.php Modified app/Router.php Modified docker/docker-compose.yml Modified docker/swoole.yml

Author: manaphp

app/Models/City.php

@@ -1,32 +1,16 @@
 <?php
-namespace App\Models;
 
-use ManaPHP\Db\Model;
+namespace App\Models;
 
 /**
- * Class App\Models\City
+ * Class City
+ *
  * @property \App\Models\Country $country
  */
-class City extends Model
+class City extends \ManaPHP\Db\Model
 {
  public $city_id;
  public $city;
  public $country_id;
  public $last_update;
-
- /**
- * @return string
- */
- public function getTable()
- {
- return 'city';
- }
-
- /**
- * @return string
- */
- public function getPrimaryKey()
- {
- return 'city_id';
- }
 }

app/Models/Country.php

@@ -1,31 +1,15 @@
 <?php
-namespace App\Models;
 
-use ManaPHP\Db\Model;
+namespace App\Models;
 
 /**
- * Class App\Models\Country
+ * Class Country
+ *
  * @property-read \App\Models\City $cities
  */
-class Country extends Model
+class Country extends \ManaPHP\Db\Model
 {
  public $country_id;
  public $country;
  public $last_update;
-
- /**
- * @return string
- */
- public function getTable()
- {
- return 'country';
- }
-
- /**
- * @return string
- */
- public function getPrimaryKey()
- {
- return 'country_id';
- }
 }

app/Router.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App;
 
 use App\Controllers\IndexController;

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "2"
 services:
  api_fpm:
- image: manaphp/php73:2.0
+ image: manaphp/php74:3.1
  volumes:
  - ../:/var/www/html
  - ./fpm/conf.d:/etc/php/conf.d
@@ -10,8 +10,9 @@ services:
  - /data/volumes/${COMPOSE_PROJECT_NAME}/api/app/tmp:/var/www/html/tmp
  restart: always
  api_nginx:
- image: nginx:1.17.1
+ image: nginx:1.17.2
  volumes:
+ - /usr/share/zoneinfo/PRC:/etc/localtime
  - ../:/var/www/html
  - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
  - /data/volumes/${COMPOSE_PROJECT_NAME}/api/nginx:/var/log/nginx

docker/swoole.yml

@@ -1,7 +1,7 @@
 version: "2"
 services:
  api:
- image: manaphp/php73:2.0
+ image: manaphp/php74:3.1
  volumes:
  - /usr/share/zoneinfo/PRC:/etc/localtime
  - ../:/var/www/html