Skip to content

Commit

Permalink
Upgrade min php 7.1 (openemr#2004)
Browse files Browse the repository at this point in the history
* updated version check and composer run to minimum php 7.1

* upgraded adldap2 package

* updated doctrine package

* updated mobiledetectlib package

* updated mpdf package

* updated phpmailer package

* updated phpspreadsheet package

* update pdf-php package

* upgrade stripe-php package

* upgrade symfony and twig packages

* upgraded phpdotenv package

* minor change

* some cleanup of unused files
  • Loading branch information
bradymiller committed Dec 2, 2018
1 parent d56ce42 commit 4011008
Show file tree
Hide file tree
Showing 4 changed files with 871 additions and 430 deletions.
40 changes: 26 additions & 14 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,41 +28,51 @@
<fileset dir="${dir.vendor}" includes="**/*.cvs*" defaultexcludes="false"/>
</delete>

<delete dir="${dir.vendor}/adldap2/adldap2/docs" verbose="true"/>
<delete dir="${dir.vendor}/adodb/adodb-php/tests" verbose="true"/>
<delete dir="${dir.vendor}/adodb/adodb-php/docs" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/cache/tests" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/collections/tests" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/common/tests" verbose="true"/>
<delete dir="${dir.vendor}/container-interop/container-interop/docs" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/cache/docs" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/common/docs" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/couchdb/tests" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/inflector/tests" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/instantiator/tests" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/event-manager/docs" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/orm/docs" verbose="true"/>
<delete dir="${dir.vendor}/dompdf/dompdf/wwww" verbose="true"/>
<delete dir="${dir.vendor}/dompdf/dompdf/tests" verbose="true"/>
<delete dir="${dir.vendor}/doctrine/reflection/docs" verbose="true"/>
<delete dir="${dir.vendor}/ezyang/htmlpurifier/test" verbose="true"/>
<delete dir="${dir.vendor}/ezyang/htmlpurifier/maintenance" verbose="true"/>
<delete dir="${dir.vendor}/ezyang/htmlpurifier/plugins" verbose="true"/>
<delete dir="${dir.vendor}/illuminate/support/Testing" verbose="true"/>
<delete dir="${dir.vendor}/phpmailer/phpmailer/examples" verbose="true"/>
<delete dir="${dir.vendor}/phpmailer/phpmailer/test" verbose="true"/>
<delete dir="${dir.vendor}/phpmailer/phpmailer/docs" verbose="true"/>
<delete dir="${dir.vendor}/knplabs/knp-snappy/doc" verbose="true"/>
<delete dir="${dir.vendor}/markbaker/complex/examples" verbose="true"/>
<delete dir="${dir.vendor}/mobiledetect/mobiledetectlib/docs" verbose="true"/>
<delete dir="${dir.vendor}/myclabs/deep-copy/doc" verbose="true"/>
<delete dir="${dir.vendor}/phenx/php-font-lib/tests" verbose="true"/>
<delete dir="${dir.vendor}/phenx/php-svg-lib/tests" verbose="true"/>
<delete dir="${dir.vendor}/phpoffice/phpspreadsheet/docs" verbose="true"/>
<delete dir="${dir.vendor}/phpoffice/phpspreadsheet/samples" verbose="true"/>
<delete dir="${dir.vendor}/phpunit/php-code-coverage/tests" verbose="true"/>
<delete dir="${dir.vendor}/phpunit/php-timer/tests" verbose="true"/>
<delete dir="${dir.vendor}/phpunit/php-token-stream/tests" verbose="true"/>
<delete dir="${dir.vendor}/phpunit/tests" verbose="true"/>
<delete dir="${dir.vendor}/psr/log/Psr/Log/Test" verbose="true"/>
<delete dir="${dir.vendor}/phpunit/phpunit-mock-objects/tests" verbose="true"/>
<delete dir="${dir.vendor}/rospdf/pdf-php/examples" verbose="true"/>
<delete dir="${dir.vendor}/rospdf/pdf-php/tests" verbose="true"/>
<delete dir="${dir.vendor}/sabberworm/php-css-parser/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/code-unit-reverse-lookup/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/comparator/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/diff/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/environment/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/exporter/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/global-state/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/object-enumerator/tests" verbose="true"/>
<delete dir="${dir.vendor}/sebastian/recursion-context/tests" verbose="true"/>
<delete dir="${dir.vendor}/smarty/smarty/demo" verbose="true"/>
<delete dir="${dir.vendor}/stripe/stripe-php/tests" verbose="true"/>
<delete dir="${dir.vendor}/stripe/stripe-php/examples" verbose="true"/>
<delete dir="${dir.vendor}/symfony/config/Tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/console/Tester" verbose="true"/>
<delete dir="${dir.vendor}/symfony/console/Tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/dependency-injection/Tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/debug/Resources/ext/tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/debug/Tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/dependency-injection/Tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/event-dispatcher/Tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/filesystem/Tests" verbose="true"/>
<delete dir="${dir.vendor}/symfony/http-foundation/Tests" verbose="true"/>
Expand All @@ -71,6 +81,8 @@
<delete dir="${dir.vendor}/symfony/yaml/Tests" verbose="true"/>
<delete dir="${dir.vendor}/twig/twig/doc" verbose="true"/>
<delete dir="${dir.vendor}/twig/twig/test" verbose="true"/>
<delete dir="${dir.vendor}/yubico/u2flib-server/examples" verbose="true"/>
<delete dir="${dir.vendor}/yubico/u2flib-server/tests" verbose="true"/>
</target>


Expand Down
2 changes: 1 addition & 1 deletion common/compatibility/Checker.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class Checker
{
private static $minimumPhpVersion = "5.6.0";
private static $minimumPhpVersion = "7.1.0";

private static function xlDelegate($value)
{
Expand Down
38 changes: 19 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,37 @@
"source" : "https://github.com/openemr/openemr"
},
"require" : {
"php" : ">=5.6.0",
"adldap2/adldap2" : "8.1.5",
"php" : ">=7.1.0",
"adldap2/adldap2" : "9.1.3",
"adodb/adodb-php" : "5.20.12",
"doctrine/common" : "2.7.3",
"doctrine/common" : "2.10.0",
"doctrine/couchdb" : "1.0-beta4",
"doctrine/orm" : "2.5.14",
"doctrine/orm" : "2.6.3",
"dompdf/dompdf" : "0.8.2",
"ezyang/htmlpurifier" : "4.10.0",
"knplabs/knp-snappy" : "1.0.4",
"mobiledetect/mobiledetectlib": "2.8.32",
"mpdf/mpdf" : "7.1.0",
"phpmailer/phpmailer" : "6.0.5",
"phpoffice/phpspreadsheet": "1.3.1",
"mobiledetect/mobiledetectlib": "2.8.33",
"mpdf/mpdf" : "7.1.7",
"phpmailer/phpmailer" : "6.0.6",
"phpoffice/phpspreadsheet": "1.5.2",
"phpseclib/phpseclib" : "2.0.12",
"rospdf/pdf-php" : "0.12.46",
"rospdf/pdf-php" : "0.12.48",
"smarty/smarty" : "2.6.31",
"stripe/stripe-php" : "6.10.0",
"symfony/config" : "2.8.42",
"symfony/dependency-injection" : "2.8.42",
"symfony/event-dispatcher" : "2.8.42",
"symfony/http-foundation" : "2.8.42",
"symfony/yaml" : "2.8.42",
"twig/twig" : "1.35.3",
"vlucas/phpdotenv" : "2.4.0",
"stripe/stripe-php" : "6.24.0",
"symfony/config" : "3.4.19",
"symfony/dependency-injection" : "3.4.19",
"symfony/event-dispatcher" : "3.4.19",
"symfony/http-foundation" : "3.4.19",
"symfony/yaml" : "3.4.19",
"twig/twig" : "2.5.0",
"vlucas/phpdotenv" : "2.5.1",
"yubico/u2flib-server" : "1.0.2",
"zendframework/zendframework" : "2.5.3",
"particle/validator": "^2.3"
"particle/validator": "2.3.3"
},
"config": {
"platform": {
"php": "5.6"
"php": "7.1"
}
},
"require-dev" : {
Expand Down
Loading

0 comments on commit 4011008

Please sign in to comment.