#884: [更新]ThinkPHP升级至5.1.9

This commit is contained in:
Anyon 2018-04-12 19:28:11 +08:00
commit 7f78f42b06
2 changed files with 83 additions and 89 deletions

@ -1 +1 @@
Subproject commit f207ac52eb4cd1bb4423f5a3d5a022103207a687
Subproject commit 04b48184e9221437541a5542ec540db1e25ea8ea

View File

@ -3,132 +3,126 @@ branches: {
}
fileChange:
/composer.json:
newFile: !uuid 'ef0e8f3d6bb13451921d82cb3529c449d48504dc'
oldFile: !uuid '8a2e7a1c4b9dc6de376b9792430c6d799a57f51d'
newFile: !uuid '8a2e7a1c4b9dc6de376b9792430c6d799a57f51d'
oldFile: !uuid 'ef0e8f3d6bb13451921d82cb3529c449d48504dc'
/thinkphp:
newFile: !uuid '60ad029fa2380036601d324a22f3db1083fd5f99'
oldFile: !uuid '6595225f54ab64739be6840be4546d005ef994c6'
newFile: !uuid 'c75ee69b06fda93f2c4ecab007e3af286987fe6e'
oldFile: !uuid '60ad029fa2380036601d324a22f3db1083fd5f99'
/thinkphp/lang:
newFile: !uuid '075cb0cd63444eadb7b003637555c4b6f7a95aef'
oldFile: !uuid '5803c3141639832adcc7211c77cdaebefb86c45c'
newFile: !uuid '5803c3141639832adcc7211c77cdaebefb86c45c'
oldFile: !uuid '075cb0cd63444eadb7b003637555c4b6f7a95aef'
/thinkphp/lang/zh-cn.php:
newFile: !uuid '16b1bb7ce93a643179aa53d3eeb95754fdd2040d'
oldFile: !uuid '5a3e0bd6bc51cde73f3d102854eaf6115b845d09'
newFile: !uuid '5a3e0bd6bc51cde73f3d102854eaf6115b845d09'
oldFile: !uuid '16b1bb7ce93a643179aa53d3eeb95754fdd2040d'
/thinkphp/library:
newFile: !uuid '5e49c53205699d3b518bf5d61a85e27ebf957dec'
oldFile: !uuid 'd0cb6781e9e3053483a0c1dec514b92fc90cb764'
newFile: !uuid '337a6c547566881d7c6caefe4354ede184c01d26'
oldFile: !uuid '5e49c53205699d3b518bf5d61a85e27ebf957dec'
/thinkphp/library/think:
newFile: !uuid 'c8c4fa8535589e3e869b70787367919213f49d8c'
oldFile: !uuid '37384672b1780f54f822848926ba6de5f7a85ffb'
newFile: !uuid 'e80e214ada389f89d5cf210c30a107fff7fd8025'
oldFile: !uuid 'c8c4fa8535589e3e869b70787367919213f49d8c'
/thinkphp/library/think/App.php:
newFile: !uuid '6da1888b5e6e6146f5e219f654a2e55e2c1fd0ca'
oldFile: !uuid '039a876aad2c8f86edfccb8a3f4f2723e5f51ecd'
newFile: !uuid '02a2e6fb43900f6df247316e75c1bcf4bda7d16c'
oldFile: !uuid '6da1888b5e6e6146f5e219f654a2e55e2c1fd0ca'
/thinkphp/library/think/Db.php:
newFile: !uuid '6ce22f391edd4e21b80c2d6c11495b237b94c3c3'
oldFile: !uuid '9be2dd2ea252b92417646a88e5ac8f17bc660716'
newFile: !uuid '9be2dd2ea252b92417646a88e5ac8f17bc660716'
oldFile: !uuid '6ce22f391edd4e21b80c2d6c11495b237b94c3c3'
/thinkphp/library/think/Loader.php:
newFile: !uuid '6354f9e47efd0731b54619c79494b295e218eb71'
oldFile: !uuid 'e2bed16f418dedb50b0ce571fe90ae93e735a85e'
newFile: !uuid 'e2bed16f418dedb50b0ce571fe90ae93e735a85e'
oldFile: !uuid '6354f9e47efd0731b54619c79494b295e218eb71'
/thinkphp/library/think/Model.php:
newFile: !uuid '433e6d096bb38fe98c084fab959baaafbd56ab47'
oldFile: !uuid '9a98a4084fa21faa627aa77e573fd959a28c0324'
newFile: !uuid '9a98a4084fa21faa627aa77e573fd959a28c0324'
oldFile: !uuid '433e6d096bb38fe98c084fab959baaafbd56ab47'
/thinkphp/library/think/Request.php:
newFile: !uuid '16db947bbc3ef2f0b8921d6c34972a006e29b4fc'
oldFile: !uuid 'c627d06d783eeba29492489c2fda33b9e0c83617'
newFile: !uuid 'c627d06d783eeba29492489c2fda33b9e0c83617'
oldFile: !uuid '16db947bbc3ef2f0b8921d6c34972a006e29b4fc'
/thinkphp/library/think/Validate.php:
newFile: !uuid '930f7d0fa45150d416bd44ef223e13a881e6b6c9'
oldFile: !uuid 'bb1700459e3dc02894f39bfc7b27c9bd4e6028bc'
newFile: !uuid 'bb1700459e3dc02894f39bfc7b27c9bd4e6028bc'
oldFile: !uuid '930f7d0fa45150d416bd44ef223e13a881e6b6c9'
/thinkphp/library/think/db:
newFile: !uuid 'c6c2c52a9b264a006f69d3dda404d63b7ae92060'
oldFile: !uuid 'f09e4be919bc966fcf3853bde2ae82b157350f8a'
newFile: !uuid 'f09e4be919bc966fcf3853bde2ae82b157350f8a'
oldFile: !uuid 'c6c2c52a9b264a006f69d3dda404d63b7ae92060'
/thinkphp/library/think/db/Builder.php:
newFile: !uuid '78ea0f4a9c35e4875ea45200daeabe6ff4ab3405'
oldFile: !uuid '31e5fc5e9b700af6af5c59aaaa0ccd4f7ba9eeeb'
newFile: !uuid '31e5fc5e9b700af6af5c59aaaa0ccd4f7ba9eeeb'
oldFile: !uuid '78ea0f4a9c35e4875ea45200daeabe6ff4ab3405'
/thinkphp/library/think/db/Connection.php:
newFile: !uuid '142e804434d8394c7c7e8f6ace09d735043956c1'
oldFile: !uuid 'aa1b74028ce2e2e7fcf47e993018c84ebb9641a9'
newFile: !uuid 'aa1b74028ce2e2e7fcf47e993018c84ebb9641a9'
oldFile: !uuid '142e804434d8394c7c7e8f6ace09d735043956c1'
/thinkphp/library/think/db/Query.php:
newFile: !uuid 'ddb2bbea7b8c40033feae406779fa553dd1ea6fe'
oldFile: !uuid '0329e1c29cb40bca5e884a7b16d390ca4a77c63e'
newFile: !uuid '0329e1c29cb40bca5e884a7b16d390ca4a77c63e'
oldFile: !uuid 'ddb2bbea7b8c40033feae406779fa553dd1ea6fe'
/thinkphp/library/think/db/builder:
newFile: !uuid 'ee78004d4ac30eeb752575d7323b86c714b062b2'
oldFile: !uuid '1e75b118beb11a26dfe7442ad4e3e8309a8fd1ca'
newFile: !uuid '1e75b118beb11a26dfe7442ad4e3e8309a8fd1ca'
oldFile: !uuid 'ee78004d4ac30eeb752575d7323b86c714b062b2'
/thinkphp/library/think/db/builder/Mysql.php:
newFile: !uuid 'a73fa293da29ae4bb9da56cd22b289860a34fa09'
oldFile: !uuid 'a17657d9fc066ec939751cfb88d384fead06b71e'
newFile: !uuid 'a17657d9fc066ec939751cfb88d384fead06b71e'
oldFile: !uuid 'a73fa293da29ae4bb9da56cd22b289860a34fa09'
/thinkphp/library/think/db/builder/Pgsql.php:
newFile: !uuid '4db6932de246ccfa9c02ee640c731b7652bea40c'
oldFile: !uuid '32373b64d5de3121b4cfc4dfc593908413adca02'
newFile: !uuid '32373b64d5de3121b4cfc4dfc593908413adca02'
oldFile: !uuid '4db6932de246ccfa9c02ee640c731b7652bea40c'
/thinkphp/library/think/db/builder/Sqlite.php:
newFile: !uuid '141410c1e64fa751f62e3e465480301f2d7eb3a3'
oldFile: !uuid '9b244617e3eed1ffff4aa0ba0ba985ecd2abcdb4'
newFile: !uuid '9b244617e3eed1ffff4aa0ba0ba985ecd2abcdb4'
oldFile: !uuid '141410c1e64fa751f62e3e465480301f2d7eb3a3'
/thinkphp/library/think/db/builder/Sqlsrv.php:
newFile: !uuid 'b95e234baa28194a3eb32952c5deb2d10cfb3531'
oldFile: !uuid '4d3dc15bc63dd71f8e39d2ded730e21b0b60cab3'
newFile: !uuid '4d3dc15bc63dd71f8e39d2ded730e21b0b60cab3'
oldFile: !uuid 'b95e234baa28194a3eb32952c5deb2d10cfb3531'
/thinkphp/library/think/model:
newFile: !uuid '72eb94f3a10d7061d301f4e808cee0bf5f4197a7'
oldFile: !uuid '20062791192f9bc9de9506fa4c3deb2518dadf18'
newFile: !uuid '20062791192f9bc9de9506fa4c3deb2518dadf18'
oldFile: !uuid '72eb94f3a10d7061d301f4e808cee0bf5f4197a7'
/thinkphp/library/think/model/concern:
newFile: !uuid '5be1acf97d6c32ac08eff851a674be25443a7dd6'
oldFile: !uuid '9a0b3f01f3054e10db89019050afa30b16bcc3dc'
newFile: !uuid '9a0b3f01f3054e10db89019050afa30b16bcc3dc'
oldFile: !uuid '5be1acf97d6c32ac08eff851a674be25443a7dd6'
/thinkphp/library/think/model/concern/SoftDelete.php:
newFile: !uuid '473f9e3eae29c1110017d71cdc16305548c22c6c'
oldFile: !uuid '68b4c197298f4888ecb39ed0abb3a0716e6e070e'
newFile: !uuid '68b4c197298f4888ecb39ed0abb3a0716e6e070e'
oldFile: !uuid '473f9e3eae29c1110017d71cdc16305548c22c6c'
/thinkphp/library/think/route:
newFile: !uuid 'f83074fb6938e907b2af8ee0c94ba828273809d2'
oldFile: !uuid '213ac17bd64f7ecb7f0e0ed7e800c2485f35e212'
newFile: !uuid '213ac17bd64f7ecb7f0e0ed7e800c2485f35e212'
oldFile: !uuid 'f83074fb6938e907b2af8ee0c94ba828273809d2'
/thinkphp/library/think/route/Rule.php:
newFile: !uuid '8d53c437773650dd792ea58f4c139c1965f8eeb0'
oldFile: !uuid '8f9d47e921356d85943ed09abaff6e438d029a51'
newFile: !uuid '8f9d47e921356d85943ed09abaff6e438d029a51'
oldFile: !uuid '8d53c437773650dd792ea58f4c139c1965f8eeb0'
/thinkphp/library/think/route/RuleGroup.php:
newFile: !uuid 'bf8c65897b4930db81bdb32e0bb97f9326f5d9dd'
oldFile: !uuid '1fe3b2722db8f8d058cfa052cf63c6ff0310917b'
newFile: !uuid '1fe3b2722db8f8d058cfa052cf63c6ff0310917b'
oldFile: !uuid 'bf8c65897b4930db81bdb32e0bb97f9326f5d9dd'
/thinkphp/library/think/route/RuleItem.php:
newFile: !uuid '27e5e7548f25ce0eda4348e988f191a6dc6e0cb2'
oldFile: !uuid '117c1a9bd2a0dc81a3092be2dd5c9061fb4a6e5c'
newFile: !uuid '117c1a9bd2a0dc81a3092be2dd5c9061fb4a6e5c'
oldFile: !uuid '27e5e7548f25ce0eda4348e988f191a6dc6e0cb2'
/thinkphp/library/think/route/dispatch:
newFile: !uuid 'd584c1ae0f6478fe797b415e1b9578d80750a7a1'
oldFile: !uuid '04a7c6fe490e644b603f93b41af8af10c1a56192'
newFile: !uuid '04a7c6fe490e644b603f93b41af8af10c1a56192'
oldFile: !uuid 'd584c1ae0f6478fe797b415e1b9578d80750a7a1'
/thinkphp/library/think/route/dispatch/Module.php:
newFile: !uuid '26c92e94d9a8da54298a8c88dedbe1b8ef420568'
oldFile: !uuid 'ec341997f2149532c27968757c542905d29f2cc6'
newFile: !uuid 'ec341997f2149532c27968757c542905d29f2cc6'
oldFile: !uuid '26c92e94d9a8da54298a8c88dedbe1b8ef420568'
/thinkphp/library/think/view:
newFile: !uuid '02a6b63831798ec16873361445861c9e78118521'
oldFile: !uuid 'e02fb921e2101c72288f6cdc64a23f350c41b10a'
newFile: !uuid 'e02fb921e2101c72288f6cdc64a23f350c41b10a'
oldFile: !uuid '02a6b63831798ec16873361445861c9e78118521'
/thinkphp/library/think/view/driver:
newFile: !uuid '11ca3b9fdfb0e06843e592120ddac76c1c795b03'
oldFile: !uuid 'f88877adeb48d69c9bd103a0e0c9e83f1c90d66a'
newFile: !uuid 'f88877adeb48d69c9bd103a0e0c9e83f1c90d66a'
oldFile: !uuid '11ca3b9fdfb0e06843e592120ddac76c1c795b03'
/thinkphp/library/think/view/driver/Php.php:
newFile: !uuid '6e5db3bd778f2810dd5d9b93f84b1ce2c910b333'
oldFile: !uuid 'f69871528bf1b0d834b94ed18df93a116dcee696'
newFile: !uuid 'f69871528bf1b0d834b94ed18df93a116dcee696'
oldFile: !uuid '6e5db3bd778f2810dd5d9b93f84b1ce2c910b333'
/thinkphp/library/think/view/driver/Think.php:
newFile: !uuid '137acf85939571819e13b7115052cbdb7edc5be7'
oldFile: !uuid '834a8c032a63e8801b11d157b28e6e26b2a61d6d'
newFile: !uuid '834a8c032a63e8801b11d157b28e6e26b2a61d6d'
oldFile: !uuid '137acf85939571819e13b7115052cbdb7edc5be7'
/vendor:
newFile: !uuid 'e1cb6ea69a457bfd362a5fb7344ef021ac966ebe'
oldFile: !uuid '032c96b318a82116d8a5b1198a4fc88bfc7d887c'
newFile: !uuid 'fba0ad7818fe766d8a47646bc178271a8d77e2b5'
oldFile: !uuid 'e1cb6ea69a457bfd362a5fb7344ef021ac966ebe'
/vendor/autoload.php:
newFile: !uuid '9102730b401b1fafb65dcdc66956c5eed0f808ea'
oldFile: !uuid '626c40b0ec529d71b8bf1af0f4b2f5ade15d14ed'
newFile: !uuid '90f0880f84d4eda92833ef36d23b5a38dcebb59b'
oldFile: !uuid '9102730b401b1fafb65dcdc66956c5eed0f808ea'
/vendor/composer:
newFile: !uuid '9f540bc937b3a468664cf6afc5f92551b68dfcc4'
oldFile: !uuid 'f794efb282c41481451a3f55996e271a162de5d3'
/vendor/composer/ClassLoader.php:
newFile: !uuid '2c72175e7723ad0c73fd3154eb0fecc420810448'
oldFile: !uuid 'dc02dfb114fb6af2eacf89407a529c37ab8e7eb8'
/vendor/composer/autoload_files.php:
newFile: !uuid 'd83d945e0fc5ced9426a7e722dc6b26706ff7c32'
oldFile: !uuid '4598fc38b786168c1d4d98778918c715fc262413'
newFile: !uuid '23ffc4d8ca3135a5ab2a69329934d808ed56598d'
oldFile: !uuid '9f540bc937b3a468664cf6afc5f92551b68dfcc4'
/vendor/composer/autoload_real.php:
newFile: !uuid '0a06a3f5e315637b5a4b002a01c9213f606c4d08'
oldFile: !uuid '2bbd72ff88e6c456fc5b10751d40057a60e325b0'
newFile: !uuid '0e9b94c3fc6290cb384bb43538cae70d78627cb5'
oldFile: !uuid '0a06a3f5e315637b5a4b002a01c9213f606c4d08'
/vendor/composer/autoload_static.php:
newFile: !uuid '804694091f8e8584669f097f6cfa3ff4c06b60ea'
oldFile: !uuid 'e8d727d37217c859632ceecceefea706330b9355'
newFile: !uuid '02cf3f2245dad4d78d1c96331e3a501432c601bf'
oldFile: !uuid '804694091f8e8584669f097f6cfa3ff4c06b60ea'
/vendor/composer/installed.json:
newFile: !uuid '5f73c19531768e8bff3540e3f8e0a99014cdf4e9'
oldFile: !uuid '44f3cbf946af721764758b3ee3c8f88612f2e039'
gitCommitId: !uuid 'f207ac52eb4cd1bb4423f5a3d5a022103207a687'
newFile: !uuid '3b331147be7f56d7134fa33cbf3355f7049779d2'
oldFile: !uuid '5f73c19531768e8bff3540e3f8e0a99014cdf4e9'
gitCommitId: !uuid '04b48184e9221437541a5542ec540db1e25ea8ea'
renames: {
}
revisionId: 883
revisionId: 884