Merge pull request #1503 from BeMySlaveDarlin/feature/preps-for-v4.1

Feature/preps for v4.1

Author: Jeckerson

.editorconfig

@@ -2,17 +2,20 @@
 
 # top-most EditorConfig file
 root = true
-charset = utf-8
-trim_trailing_whitespace = true
 
 [*]
+charset = utf-8
 indent_style = space
 indent_size = 4
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
 
 [*.sh]
-indent_style = tab
+indent_style = tab
+
+[*.yml]
+indent_size = 2

CHANGELOG.md

@@ -1,3 +1,14 @@
+# [4.1.0](https://github.com/phalcon/cphalcon/releases/tag/v4.1.0)
+## Fixed
+- Fixed column annotation bugs on model creation [1425](https://github.com/phalcon/phalcon-devtools/issues/1425)
+
+## Changed
+- Migrated phalcon-migrations dependency up to v2 [1464](https://github.com/phalcon/phalcon-devtools/issues/1464)
+
+## Added
+- Added docker environment for devtools isolated development
+
+
 # [4.0.7](https://github.com/phalcon/cphalcon/releases/tag/v4.0.7)
 ## Fixed
 - Fixed not found error on webtools [#1500](https://github.com/phalcon/phalcon-devtools/issues/1500)

Makefile

@@ -0,0 +1,16 @@
+all: build composer-install
+
+build:
+	@docker-compose build
+	@docker-compose up -d
+composer-install:
+	@docker-compose exec -T service_php composer install
+clean:
+	@docker-compose down
+	@docker system prune -af
+	@docker volume prune -f
+
+help:
+	@docker-compose exec -T service_php phalcon --help
+create-dummy:
+	@docker-compose exec -T service_php phalcon create-project dummy --enable-webtools --force

README.md

@@ -37,7 +37,7 @@ Create the composer.json file as follows:
 ```json
 {
     "require-dev": {
-        "phalcon/devtools": "~4.0"
+        "phalcon/devtools": "~4.1"
     }
 }
 ```
@@ -115,7 +115,7 @@ This command should display something similar to:
 ```sh
 $ phalcon --help
 
-Phalcon DevTools (4.0.4)
+Phalcon DevTools (4.1.0)
 
 Help:
   Lists the commands available in Phalcon DevTools
@@ -169,7 +169,7 @@ By creating **config.json** or any other configuration file called **config** in
 }
 ```
 
-And then you can use use `phalcon migration run` or `phalcon controller SomeClass` and those commands will be executed with options from file. Arguments provided by developer from command line will overwrite existing one in file.
+And then you can use `phalcon migration run` or `phalcon controller SomeClass` and those commands will be executed with options from file. Arguments provided by developer from command line will overwrite existing one in a file.
 
 ## License
 

composer.json

@@ -27,7 +27,7 @@
         "ext-phalcon": "^4.0.0",
         "psy/psysh": "~0.9",
         "nikic/php-parser": "^4.2.4",
-        "phalcon/migrations": "^1.1",
+        "phalcon/migrations": "^2.0",
         "vlucas/phpdotenv": "^3.6|^4.0|^5.0"
     },
     "require-dev": {

composer.lock

@@ -0,0 +1,58 @@
+version: "3.6"
+services:
+  service_php:
+    build:
+      context: ./docker/php
+    working_dir: /app
+    restart: always
+    volumes:
+      - ./:/app
+      - ./docker/php/mods/psr.ini:/etc/php/7.4/fpm/conf.d/20-psr.ini
+      - ./docker/php/mods/phalcon.ini:/etc/php/7.4/fpm/conf.d/50-phalcon.ini
+      - ./docker/php/mods/psr.ini:/etc/php/7.4/cli/conf.d/20-psr.ini
+      - ./docker/php/mods/phalcon.ini:/etc/php/7.4/cli/conf.d/50-phalcon.ini
+    depends_on:
+      - service_mysql
+      - service_postgres
+
+  service_nginx:
+    image: nginx:alpine
+    restart: always
+    ports:
+      - 8081:80
+    volumes:
+      - ./:/app
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d
+      - ./docker/nginx/fastcgi.conf:/etc/nginx/fastcgi.conf
+      - ./docker/nginx/fastcgi-php.conf:/etc/nginx/fastcgi-php.conf
+    depends_on:
+      - service_php
+
+  service_mysql:
+    image: mariadb
+    restart: always
+    environment:
+      - MYSQL_DATABASE=devtools
+      - MYSQL_USER=devtools
+      - MYSQL_PASSWORD=password
+      - MYSQL_ROOT_PASSWORD=password
+    volumes:
+      - db_mysql_data:/var/lib/mysql/
+      - ./docker/mysql/config:/etc/mysql/conf.d/
+
+  service_postgres:
+    image: postgis/postgis:13-master
+    restart: always
+    environment:
+      - POSTGRES_USER=devtools
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=devtools
+    volumes:
+      - db_postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: pg_isready -q -d devtools -U devtools
+      timeout: 5s
+
+volumes:
+  db_mysql_data:
+  db_postgres_data:

docker-compose.yml

@@ -0,0 +1,6 @@
+[mysqld]
+sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
+max_connections = 500
+max_allowed_packet = 32mb
+skip-host-cache
+skip-name-resolve

docker/mysql/my.cnf

@@ -0,0 +1,33 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    root /app/dummy/public/;
+    index index.php index.html index.htm;
+
+    client_max_body_size 128M;
+
+    location / {
+        try_files $uri $uri/ /index.php?_url=$uri&$args;
+    }
+
+    location /webtools {
+        try_files $uri $uri/ /webtools.php?_url=$uri&$args;
+    }
+
+    location ~ \.php$ {
+        fastcgi_pass service_php:8000;
+        include fastcgi-php.conf;
+
+        fastcgi_buffers 16 32k;
+        fastcgi_buffer_size 32k;
+
+        fastcgi_connect_timeout 600;
+        fastcgi_send_timeout 600;
+        fastcgi_read_timeout 600;
+    }
+
+    location ~ /\.(ht|svn|git) {
+        deny all;
+    }
+}

docker/nginx/conf.d/default.conf

@@ -0,0 +1,13 @@
+# regex to split $uri to $fastcgi_script_name and $fastcgi_path
+fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+
+# Check that the PHP script exists before passing it
+try_files $uri /index.php =404;
+
+# Bypass the fact that try_files resets $fastcgi_path_info
+# see: http://trac.nginx.org/nginx/ticket/321
+set $path_info $fastcgi_path_info;
+fastcgi_param PATH_INFO $path_info;
+
+fastcgi_index index.php;
+include fastcgi.conf;

docker/nginx/fastcgi-php.conf

@@ -0,0 +1,26 @@
+
+fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;