Merge pull request #1504 from phalcon/4.1.x

v4.1.0

.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": {