Skip to content

Commit

Permalink
Merge pull request #1216 from jim-parry/cleanup
Browse files Browse the repository at this point in the history
Niggly fixes
  • Loading branch information
lonnieezell authored Sep 13, 2018
2 parents 3aa229e + 2517c0c commit 8135038
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 38 deletions.
68 changes: 33 additions & 35 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
{
"description": "The CodeIgniter framework v4",
"name": "codeigniter4/framework",
"type": "project",
"homepage": "https://codeigniter.com",
"license": "MIT",
"support": {
"forum": "http://forum.codeigniter.com/",
"wiki": "https://github.com/bcit-ci/CodeIgniter4/wiki",
"slack": "https://codeigniterchat.slack.com",
"source": "https://github.com/bcit-ci/CodeIgniter4"
},
"autoload": {
"psr-4": {
"CodeIgniter\\": "system/",
"Psr\\Log\\": "system/ThirdParty/PSR/Log/"
}
},
"require": {
"php": ">=7.1",
"zendframework/zend-escaper": "^2.5",
"paragonie/sodium_compat": "^1.1",
"kint-php/kint": "^2.1",
"ext-intl": "*"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"mikey179/vfsStream": "1.6.*",
"codeigniter4/codeigniter4-standard": "^1.0"
},
"scripts": {
"post-update-cmd": [
"composer dump-autoload",
"CodeIgniter\\ComposerScripts::postUpdate"
]
}
"description": "The CodeIgniter framework v4",
"name": "codeigniter4/framework",
"type": "project",
"homepage": "https://codeigniter.com",
"license": "MIT",
"support": {
"forum": "http://forum.codeigniter.com/",
"slack": "https://codeigniterchat.slack.com",
"source": "https://github.com/bcit-ci/CodeIgniter4"
},
"autoload": {
"psr-4": {
"CodeIgniter\\": "system/",
"Psr\\Log\\": "system/ThirdParty/PSR/Log/"
}
},
"require": {
"php": ">=7.1",
"zendframework/zend-escaper": "^2.5",
"kint-php/kint": "^2.1",
"ext-intl": "*"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"mikey179/vfsStream": "1.6.*",
"codeigniter4/codeigniter4-standard": "^1.0"
},
"scripts": {
"post-update-cmd": [
"composer dump-autoload",
"CodeIgniter\\ComposerScripts::postUpdate"
]
}
}
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ If you change anything that requires a change to documentation then you will nee

### Compatibility

CodeIgniter4 requires PHP 7.
CodeIgniter4 requires PHP 7.1.

### Branching

Expand Down
2 changes: 1 addition & 1 deletion system/CodeIgniter.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class CodeIgniter
/**
* The current version of CodeIgniter Framework
*/
const CI_VERSION = '4.0-dev';
const CI_VERSION = '4.0.0-dev';

/**
* App startup time.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# built documents.
#
# The short X.Y version.
version = '4.0.0-dev'
version = '4.0.0'
# The full version, including alpha/beta/rc tags.
release = '4.0.0-dev'

Expand Down

0 comments on commit 8135038

Please sign in to comment.