Skip to content

Commit

Permalink
Merge pull request #8 from nuslj/UPD-1-23
Browse files Browse the repository at this point in the history
Update phpSpredSheet to 1.23, v1.0.5
  • Loading branch information
ivanramosnet authored May 9, 2022
2 parents 3d6e255 + 62e4820 commit 34aea6f
Show file tree
Hide file tree
Showing 301 changed files with 16,292 additions and 10,135 deletions.
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You can download the current version / older version of PhpSpreadsheet-Joomla-Li
Version
-------

* The current Joomla! Library is using PhpSpreadsheet 1.20.0.
* The current Joomla! Library is using PhpSpreadsheet 1.23.0.

Usage
-----
Expand Down Expand Up @@ -56,3 +56,10 @@ Credits
License
-------
PhpSpreadsheet is licensed under [LGPL (GNU LESSER GENERAL PUBLIC LICENSE)](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/license.md)

Note
----

The library folder was build using the given composer.json file and executing:

composer update --no-dev --prefer-dist
34 changes: 17 additions & 17 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion phpspreadsheet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>ivan.ramos.name</authorUrl>
<version>1.0.4</version>
<version>1.0.5</version>
<files>
<file>phpspreadsheet.php</file>
<folder>vendor</folder>
Expand Down
34 changes: 17 additions & 17 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,17 +296,17 @@
},
{
"name": "phpoffice/phpspreadsheet",
"version": "1.20.0",
"version_normalized": "1.20.0.0",
"version": "1.23.0",
"version_normalized": "1.23.0.0",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
"reference": "44436f270bb134b4a94670f3d020a85dfa0a3c02"
"reference": "21e4cf62699eebf007db28775f7d1554e612ed9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/44436f270bb134b4a94670f3d020a85dfa0a3c02",
"reference": "44436f270bb134b4a94670f3d020a85dfa0a3c02",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21e4cf62699eebf007db28775f7d1554e612ed9e",
"reference": "21e4cf62699eebf007db28775f7d1554e612ed9e",
"shasum": ""
},
"require": {
Expand All @@ -330,14 +330,14 @@
"php": "^7.3 || ^8.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"psr/simple-cache": "^1.0"
"psr/simple-cache": "^1.0 || ^2.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "dev-master",
"dompdf/dompdf": "^1.0",
"friendsofphp/php-cs-fixer": "^3.2",
"jpgraph/jpgraph": "^4.0",
"mpdf/mpdf": "^8.0",
"mpdf/mpdf": "8.0.17",
"phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.1",
"phpstan/phpstan-phpunit": "^1.0",
Expand All @@ -351,7 +351,7 @@
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
"tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
},
"time": "2021-11-23T15:23:42+00:00",
"time": "2022-04-24T13:53:10+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down Expand Up @@ -397,7 +397,7 @@
],
"support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.20.0"
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.23.0"
},
"install-path": "../phpoffice/phpspreadsheet"
},
Expand Down Expand Up @@ -620,8 +620,8 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.24.0",
"version_normalized": "1.24.0.0",
"version": "v1.25.0",
"version_normalized": "1.25.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
Expand Down Expand Up @@ -655,12 +655,12 @@
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
},
"files": [
"bootstrap.php"
]
],
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
Expand All @@ -686,7 +686,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
},
"funding": [
{
Expand All @@ -705,6 +705,6 @@
"install-path": "../symfony/polyfill-mbstring"
}
],
"dev": true,
"dev": false,
"dev-package-names": []
}
16 changes: 8 additions & 8 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '8b35f05304bf4cf39c052645d67f4cc565ca1b93',
'reference' => 'bc2250d5b9881a09ed85062a6aa98825e8655d54',
'name' => '__root__',
'dev' => true,
'dev' => false,
),
'versions' => array(
'__root__' => array(
Expand All @@ -16,7 +16,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '8b35f05304bf4cf39c052645d67f4cc565ca1b93',
'reference' => 'bc2250d5b9881a09ed85062a6aa98825e8655d54',
'dev_requirement' => false,
),
'ezyang/htmlpurifier' => array(
Expand Down Expand Up @@ -65,12 +65,12 @@
'dev_requirement' => false,
),
'phpoffice/phpspreadsheet' => array(
'pretty_version' => '1.20.0',
'version' => '1.20.0.0',
'pretty_version' => '1.23.0',
'version' => '1.23.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../phpoffice/phpspreadsheet',
'aliases' => array(),
'reference' => '44436f270bb134b4a94670f3d020a85dfa0a3c02',
'reference' => '21e4cf62699eebf007db28775f7d1554e612ed9e',
'dev_requirement' => false,
),
'psr/http-client' => array(
Expand Down Expand Up @@ -110,8 +110,8 @@
'dev_requirement' => false,
),
'symfony/polyfill-mbstring' => array(
'pretty_version' => 'v1.24.0',
'version' => '1.24.0.0',
'pretty_version' => 'v1.25.0',
'version' => '1.25.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
'aliases' => array(),
Expand Down
8 changes: 4 additions & 4 deletions vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
'braces' => true,
'cast_spaces' => true,
'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']], // const are often grouped with other related const
'class_definition' => true,
'class_definition' => false,
'class_keyword_remove' => false, // ::class keyword gives us better support in IDE
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'combine_nested_dirname' => true,
'comment_to_phpdoc' => true,
'comment_to_phpdoc' => false, // interferes with annotations
'compact_nullable_typehint' => true,
'concat_space' => ['spacing' => 'one'],
'constant_case' => true,
Expand Down Expand Up @@ -55,7 +55,7 @@
'function_declaration' => true,
'function_to_constant' => true,
'function_typehint_space' => true,
'general_phpdoc_annotation_remove' => ['annotations' => ['access', 'category', 'copyright', 'method', 'throws']],
'general_phpdoc_annotation_remove' => ['annotations' => ['access', 'category', 'copyright', 'throws']],
'global_namespace_import' => true,
'header_comment' => false, // We don't use common header in all our files
'heredoc_indentation' => false, // Requires PHP >= 7.3
Expand Down Expand Up @@ -171,7 +171,7 @@
'phpdoc_separation' => true,
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_to_comment' => true,
'phpdoc_to_comment' => false, // interferes with annotations
'phpdoc_to_param_type' => false, // Because experimental, but interesting for one shot use
'phpdoc_to_return_type' => false, // idem
'phpdoc_trim' => true,
Expand Down
Loading

0 comments on commit 34aea6f

Please sign in to comment.