projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #10798 from jitendrapurohit/CRM-21000Fix
[civicrm-core.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index 64f2503d5ac45243daf757843a27796a385023a1..aa90a4657639295241b510c381089efc5569234e 100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-8,7
+8,8
@@
},
"include-path": ["vendor/tecnickcom"],
"require": {
},
"include-path": ["vendor/tecnickcom"],
"require": {
- "dompdf/dompdf" : "0.7.*",
+ "dompdf/dompdf" : "0.8.*",
+ "electrolinux/phpquery": "^0.9.6",
"symfony/config": "~2.5.0",
"symfony/dependency-injection": "~2.5.0",
"symfony/event-dispatcher": "~2.5.0",
"symfony/config": "~2.5.0",
"symfony/dependency-injection": "~2.5.0",
"symfony/event-dispatcher": "~2.5.0",
@@
-17,12
+18,15
@@
"psr/log": "1.0.0",
"symfony/finder": "~2.5.0",
"tecnickcom/tcpdf" : "6.2.*",
"psr/log": "1.0.0",
"symfony/finder": "~2.5.0",
"tecnickcom/tcpdf" : "6.2.*",
- "totten/ca-config": "~13.02",
- "civicrm/civicrm-cxn-rpc": "~0.15.12.04",
+ "totten/ca-config": "~17.05",
"zetacomponents/base": "1.7.*",
"zetacomponents/mail": "dev-1.7-civi",
"phpoffice/phpword": "^0.13.0",
"zetacomponents/base": "1.7.*",
"zetacomponents/mail": "dev-1.7-civi",
"phpoffice/phpword": "^0.13.0",
- "pear/Validate_Finance_CreditCard": "dev-master"
+ "pear/Validate_Finance_CreditCard": "dev-master",
+ "civicrm/civicrm-cxn-rpc": "~0.16.12.05",
+ "pear/Auth_SASL": "1.1.0",
+ "pear/Net_SMTP": "1.6.*",
+ "pear/Net_socket": "1.0.*"
},
"repositories": [
{
},
"repositories": [
{
@@
-34,12
+38,16
@@
"post-install-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
"bash tools/scripts/composer/tcpdf-cleanup.sh",
"post-install-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
"bash tools/scripts/composer/tcpdf-cleanup.sh",
- "bash tools/scripts/composer/pear-execption-fix.sh"
+ "bash tools/scripts/composer/pear-exception-fix.sh",
+ "bash tools/scripts/composer/net-smtp-fix.sh",
+ "bash tools/scripts/composer/phpword-jquery.sh"
],
"post-update-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
"bash tools/scripts/composer/tcpdf-cleanup.sh",
],
"post-update-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
"bash tools/scripts/composer/tcpdf-cleanup.sh",
- "bash tools/scripts/composer/pear-execption-fix.sh"
+ "bash tools/scripts/composer/pear-exception-fix.sh",
+ "bash tools/scripts/composer/net-smtp-fix.sh",
+ "bash tools/scripts/composer/phpword-jquery.sh"
]
}
}
]
}
}