From 29bdbd4e0bcc27fdb4d0db56a791a2e766e03691 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Thu, 25 Aug 2016 13:53:15 +0900 Subject: [PATCH] Respect PSR-0 with matching folder name and namespace `PhpSpreadsheetTests` --- composer.json | 2 +- phpunit.xml.dist | 2 +- .../Calculation/DateTimeTest.php | 2 +- .../Calculation/EngineeringTest.php | 6 +++--- .../Calculation/FinancialTest.php | 2 +- .../Calculation/FunctionsTest.php | 2 +- .../Calculation/LogicalTest.php | 2 +- .../Calculation/LookupRefTest.php | 2 +- .../Calculation/MathTrigTest.php | 2 +- .../Calculation/TextDataTest.php | 2 +- .../CalculationTest.php | 2 +- .../Cell/AdvancedValueBinderTest.php | 2 +- .../Cell/DataTypeTest.php | 2 +- .../Cell/DefaultValueBinderTest.php | 2 +- .../Cell/HyperlinkTest.php | 2 +- tests/{PhpSpreadsheet => PhpSpreadsheetTests}/CellTest.php | 2 +- .../Chart/DataSeriesValuesTest.php | 2 +- .../Chart/LayoutTest.php | 2 +- .../Chart/LegendTest.php | 2 +- .../Custom/Complex.php | 2 +- .../Custom/ComplexAssert.php | 2 +- .../Reader/XEEValidatorTest.php | 2 +- .../ReferenceHelperTest.php | 2 +- .../SettingsTest.php | 2 +- .../Shared/CodePageTest.php | 2 +- .../Shared/DateTest.php | 2 +- .../Shared/FileTest.php | 2 +- .../Shared/FontTest.php | 2 +- .../Shared/PasswordHasherTest.php | 2 +- .../Shared/StringTest.php | 2 +- .../Shared/TimeZoneTest.php | 2 +- .../Style/ColorTest.php | 2 +- .../Style/NumberFormatDateTest.php | 2 +- .../Style/NumberFormatTest.php | 2 +- .../Worksheet/AutoFilter/Column/RuleTest.php | 2 +- .../Worksheet/AutoFilter/ColumnTest.php | 2 +- .../Worksheet/AutoFilterTest.php | 2 +- .../Worksheet/CellCollectionTest.php | 2 +- .../Worksheet/ColumnCellIteratorTest.php | 2 +- .../Worksheet/ColumnIteratorTest.php | 2 +- .../Worksheet/RowCellIteratorTest.php | 2 +- .../Worksheet/RowIteratorTest.php | 2 +- .../Worksheet/WorksheetColumnTest.php | 2 +- .../Worksheet/WorksheetRowTest.php | 2 +- 44 files changed, 46 insertions(+), 46 deletions(-) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/DateTimeTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/EngineeringTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/FinancialTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/FunctionsTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/LogicalTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/LookupRefTest.php (96%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/MathTrigTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Calculation/TextDataTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/CalculationTest.php (97%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Cell/AdvancedValueBinderTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Cell/DataTypeTest.php (94%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Cell/DefaultValueBinderTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Cell/HyperlinkTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/CellTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Chart/DataSeriesValuesTest.php (97%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Chart/LayoutTest.php (94%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Chart/LegendTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Custom/Complex.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Custom/ComplexAssert.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Reader/XEEValidatorTest.php (97%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/ReferenceHelperTest.php (97%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/SettingsTest.php (95%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Shared/CodePageTest.php (97%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Shared/DateTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Shared/FileTest.php (95%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Shared/FontTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Shared/PasswordHasherTest.php (93%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Shared/StringTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Shared/TimeZoneTest.php (95%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Style/ColorTest.php (97%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Style/NumberFormatDateTest.php (95%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Style/NumberFormatTest.php (95%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/AutoFilter/Column/RuleTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/AutoFilter/ColumnTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/AutoFilterTest.php (99%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/CellCollectionTest.php (94%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/ColumnCellIteratorTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/ColumnIteratorTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/RowCellIteratorTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/RowIteratorTest.php (98%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/WorksheetColumnTest.php (96%) rename tests/{PhpSpreadsheet => PhpSpreadsheetTests}/Worksheet/WorksheetRowTest.php (96%) diff --git a/composer.json b/composer.json index 41864bfd..f5ec8def 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ }, "autoload-dev": { "psr-4": { - "PhpSpreadsheet\\Tests\\": "tests/PhpSpreadsheet" + "PhpSpreadsheetTests\\": "tests/PhpSpreadsheetTests" } } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2843d1a5..52bbf2c7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -8,7 +8,7 @@ - ./tests/PhpSpreadsheet + ./tests/PhpSpreadsheetTests diff --git a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php b/tests/PhpSpreadsheetTests/Calculation/DateTimeTest.php similarity index 99% rename from tests/PhpSpreadsheet/Calculation/DateTimeTest.php rename to tests/PhpSpreadsheetTests/Calculation/DateTimeTest.php index 9a46cbda..6c72d6f8 100644 --- a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/DateTimeTest.php @@ -1,6 +1,6 @@ complexAssert = new \PhpSpreadsheet\Tests\Custom\ComplexAssert(); + $this->complexAssert = new \PhpSpreadsheetTests\Custom\ComplexAssert(); Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); } diff --git a/tests/PhpSpreadsheet/Calculation/FinancialTest.php b/tests/PhpSpreadsheetTests/Calculation/FinancialTest.php similarity index 99% rename from tests/PhpSpreadsheet/Calculation/FinancialTest.php rename to tests/PhpSpreadsheetTests/Calculation/FinancialTest.php index 61b3752c..48c49b60 100644 --- a/tests/PhpSpreadsheet/Calculation/FinancialTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/FinancialTest.php @@ -1,6 +1,6 @@