diff --git a/.travis.yml b/.travis.yml index 31b50b5..f2f44bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: # -in id_rsa.enc -out ~/.ssh/id_rsa -d # - chmod 600 ~/.ssh/id_rsa # - echo -e "Host ip\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +- echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - composer install after_success: diff --git a/README-CN.md b/README-CN.md index 92c11b2..b01a257 100644 --- a/README-CN.md +++ b/README-CN.md @@ -757,3 +757,7 @@ cp ./.git-hooks/* ./git/hooks - 懒加载优化框架加载流程 - 变更Helper助手类的成员方法为框架函数，简化使用提高生产效率 - 性能测试和优化 + +# CONTACT + + diff --git a/composer.json b/composer.json index e9ab6f0..710ab59 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { "name": "tigerb/easy-php", "description": "A Faster Lightweight Full-Stack PHP Framework", - "version": "0.6.9", - "type": "framework, easy-php, php framework", + "version": "0.7.0", + "type": "framework", "homepage": "http://php.tiegrb.cn/", "license": "MIT", "minimum-stability": "stable", diff --git a/composer.lock b/composer.lock index 9776dc5..e5d0d0c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,9 +4,68 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "1ff01287997d28b1842a1ad706d2778a", - "content-hash": "3bd3cd1e470a180bf936c6625d7d426e", - "packages": [], + "hash": "a38313b647d8d7975194d65677e67a46", + "content-hash": "549e5dbbc9227ecb414ae14ab91d02c1", + "packages": [ + { + "name": "mongodb/mongodb", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/mongodb/mongo-php-library.git", + "reference": "a307dd60e71e1291c60927ea4f3a1905146063f5" + }, + "dist": { + "type": "zip", + "url": "https://files.phpcomposer.com/files/mongodb/mongo-php-library/a307dd60e71e1291c60927ea4f3a1905146063f5.zip", + "reference": "a307dd60e71e1291c60927ea4f3a1905146063f5", + "shasum": "" + }, + "require": { + "ext-mongodb": "^1.2.0", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "^4.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "MongoDB\\": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Jeremy Mikola", + "email": "jmikola@gmail.com" + }, + { + "name": "Hannes Magnusson", + "email": "bjori@mongodb.com" + }, + { + "name": "Derick Rethans", + "email": "github@derickrethans.nl" + } + ], + "description": "MongoDB driver library", + "homepage": "https://jira.mongodb.org/browse/PHPLIB", + "keywords": [ + "database", + "driver", + "mongodb", + "persistence" + ], + "time": "2017-02-16 18:40:32" + } + ], "packages-dev": [ { "name": "doctrine/instantiator", @@ -667,16 +726,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.1.2", + "version": "6.2.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fbf2e46d5c563ee78c9b559bcbeb1c97cad6af0f" + "reference": "fa5711d0559fc4b64deba0702be52d41434cbcb7" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/sebastianbergmann/phpunit/fbf2e46d5c563ee78c9b559bcbeb1c97cad6af0f.zip", - "reference": "fbf2e46d5c563ee78c9b559bcbeb1c97cad6af0f", + "url": "https://files.phpcomposer.com/files/sebastianbergmann/phpunit/fa5711d0559fc4b64deba0702be52d41434cbcb7.zip", + "reference": "fa5711d0559fc4b64deba0702be52d41434cbcb7", "shasum": "" }, "require": { @@ -696,8 +755,8 @@ "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^4.0", "sebastian/comparator": "^2.0", - "sebastian/diff": "^1.2", - "sebastian/environment": "^3.0.1", + "sebastian/diff": "^1.4.3 || ^2.0", + "sebastian/environment": "^3.0.2", "sebastian/exporter": "^3.1", "sebastian/global-state": "^1.1 || ^2.0", "sebastian/object-enumerator": "^3.0.2", @@ -721,7 +780,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1.x-dev" + "dev-master": "6.2.x-dev" } }, "autoload": { @@ -747,20 +806,20 @@ "testing", "xunit" ], - "time": "2017-04-25 21:30:13" + "time": "2017-07-03 15:54:24" }, { "name": "phpunit/phpunit-mock-objects", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "eabce450df194817a7d7e27e19013569a903a2bf" + "reference": "d8833b396dce9162bb2eb5d59aee5a3ab3cfa5b4" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/sebastianbergmann/phpunit-mock-objects/eabce450df194817a7d7e27e19013569a903a2bf.zip", - "reference": "eabce450df194817a7d7e27e19013569a903a2bf", + "url": "https://files.phpcomposer.com/files/sebastianbergmann/phpunit-mock-objects/d8833b396dce9162bb2eb5d59aee5a3ab3cfa5b4.zip", + "reference": "d8833b396dce9162bb2eb5d59aee5a3ab3cfa5b4", "shasum": "" }, "require": { @@ -806,7 +865,7 @@ "mock", "xunit" ], - "time": "2017-03-03 06:30:20" + "time": "2017-06-30 08:15:21" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -919,23 +978,23 @@ }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/sebastianbergmann/diff/13edfd8706462032c2f52b4b862974dd46b71c9e.zip", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://files.phpcomposer.com/files/sebastianbergmann/diff/7f066a26a962dbe58ddea9f72a4e82874a3975a4.zip", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -967,20 +1026,20 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2017-05-22 07:24:03" }, { "name": "sebastian/environment", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "11e7710b7724d42c62249b0e9d3030240398949d" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/sebastianbergmann/environment/11e7710b7724d42c62249b0e9d3030240398949d.zip", - "reference": "11e7710b7724d42c62249b0e9d3030240398949d", + "url": "https://files.phpcomposer.com/files/sebastianbergmann/environment/cd0871b3975fb7fc44d11314fd1ee20925fce4f5.zip", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { @@ -992,7 +1051,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -1017,7 +1076,7 @@ "environment", "hhvm" ], - "time": "2017-04-21 14:40:32" + "time": "2017-07-01 08:51:00" }, { "name": "sebastian/exporter", @@ -1369,64 +1428,37 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.8.1", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" + "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/squizlabs/PHP_CodeSniffer/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d.zip", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "url": "https://files.phpcomposer.com/files/squizlabs/PHP_CodeSniffer/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219.zip", + "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.1.2" + "php": ">=5.4.0" }, "require-dev": { "phpunit/phpunit": "~4.0" }, "bin": [ - "scripts/phpcs", - "scripts/phpcbf" + "bin/phpcs", + "bin/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Fixer.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -1443,7 +1475,7 @@ "phpcs", "standards" ], - "time": "2017-03-01 22:17:45" + "time": "2017-06-14 01:23:49" }, { "name": "theseer/tokenizer", diff --git a/qrcode.jpg b/qrcode.jpg new file mode 100644 index 0000000..47b102c Binary files /dev/null and b/qrcode.jpg differ