Switch to PSR-4

ddeboer · May 2, 2015 · b0122a5 · b0122a5
1 parent 889dc04
commit b0122a5
Show file tree

Hide file tree

Showing 106 changed files with 5 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -42,6 +42,9 @@
         "symfony/property-access": "If you want to use the ObjectConverter"
     },
     "autoload": {
-        "psr-0": { "Ddeboer\\DataImport": "src" }
+        "psr-4": { 
+            "Ddeboer\\DataImport\\": "src/",
+            "Ddeboer\\DataImport\\Tests\\": "tests/"
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true">
     <testsuites>
         <testsuite name="ddeboer/data-import">
             <directory suffix="Test.php">./tests</directory>

diff --git a/...t/Exception/DuplicateHeadersException.php → src/Exception/DuplicateHeadersException.php b/...t/Exception/DuplicateHeadersException.php → src/Exception/DuplicateHeadersException.php
diff --git a/...taImport/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php b/...taImport/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php
diff --git a/...DataImport/Exception/MappingException.php → src/Exception/MappingException.php b/...DataImport/Exception/MappingException.php → src/Exception/MappingException.php
diff --git a/.../DataImport/Exception/ReaderException.php → src/Exception/ReaderException.php b/.../DataImport/Exception/ReaderException.php → src/Exception/ReaderException.php
diff --git a/...ort/Exception/SourceNotFoundException.php → src/Exception/SourceNotFoundException.php b/...ort/Exception/SourceNotFoundException.php → src/Exception/SourceNotFoundException.php
diff --git a/...ort/Exception/UnexpectedTypeException.php → src/Exception/UnexpectedTypeException.php b/...ort/Exception/UnexpectedTypeException.php → src/Exception/UnexpectedTypeException.php
diff --git a/...rt/Exception/UnexpectedValueException.php → src/Exception/UnexpectedValueException.php b/...rt/Exception/UnexpectedValueException.php → src/Exception/UnexpectedValueException.php
diff --git a/...aImport/Exception/ValidationException.php → src/Exception/ValidationException.php b/...aImport/Exception/ValidationException.php → src/Exception/ValidationException.php
diff --git a/.../DataImport/Exception/WriterException.php → src/Exception/WriterException.php b/.../DataImport/Exception/WriterException.php → src/Exception/WriterException.php
diff --git a/...Import/Filter/DateTimeThresholdFilter.php → src/Filter/DateTimeThresholdFilter.php b/...Import/Filter/DateTimeThresholdFilter.php → src/Filter/DateTimeThresholdFilter.php
diff --git a/...deboer/DataImport/Filter/OffsetFilter.php → src/Filter/OffsetFilter.php b/...deboer/DataImport/Filter/OffsetFilter.php → src/Filter/OffsetFilter.php
diff --git a/...oer/DataImport/Filter/ValidatorFilter.php → src/Filter/ValidatorFilter.php b/...oer/DataImport/Filter/ValidatorFilter.php → src/Filter/ValidatorFilter.php
diff --git a/...Ddeboer/DataImport/Reader/ArrayReader.php → src/Reader/ArrayReader.php b/...Ddeboer/DataImport/Reader/ArrayReader.php → src/Reader/ArrayReader.php
diff --git a/...mport/Reader/CountableReaderInterface.php → src/Reader/CountableReaderInterface.php b/...mport/Reader/CountableReaderInterface.php → src/Reader/CountableReaderInterface.php
diff --git a/src/Ddeboer/DataImport/Reader/CsvReader.php → src/Reader/CsvReader.php b/src/Ddeboer/DataImport/Reader/CsvReader.php → src/Reader/CsvReader.php
diff --git a/src/Ddeboer/DataImport/Reader/DbalReader.php → src/Reader/DbalReader.php b/src/Ddeboer/DataImport/Reader/DbalReader.php → src/Reader/DbalReader.php
diff --git a/...boer/DataImport/Reader/DoctrineReader.php → src/Reader/DoctrineReader.php b/...boer/DataImport/Reader/DoctrineReader.php → src/Reader/DoctrineReader.php
diff --git a/...Ddeboer/DataImport/Reader/ExcelReader.php → src/Reader/ExcelReader.php b/...Ddeboer/DataImport/Reader/ExcelReader.php → src/Reader/ExcelReader.php
diff --git a/...mport/Reader/Factory/CsvReaderFactory.php → src/Reader/Factory/CsvReaderFactory.php b/...mport/Reader/Factory/CsvReaderFactory.php → src/Reader/Factory/CsvReaderFactory.php
diff --git a/...port/Reader/Factory/DbalReaderFactory.php → src/Reader/Factory/DbalReaderFactory.php b/...port/Reader/Factory/DbalReaderFactory.php → src/Reader/Factory/DbalReaderFactory.php
diff --git a/.../Reader/Factory/DoctrineReaderFactory.php → src/Reader/Factory/DoctrineReaderFactory.php b/.../Reader/Factory/DoctrineReaderFactory.php → src/Reader/Factory/DoctrineReaderFactory.php
diff --git a/...ort/Reader/Factory/ExcelReaderFactory.php → src/Reader/Factory/ExcelReaderFactory.php b/...ort/Reader/Factory/ExcelReaderFactory.php → src/Reader/Factory/ExcelReaderFactory.php
diff --git a/...oer/DataImport/Reader/OneToManyReader.php → src/Reader/OneToManyReader.php b/...oer/DataImport/Reader/OneToManyReader.php → src/Reader/OneToManyReader.php
diff --git a/src/Ddeboer/DataImport/Reader/PdoReader.php → src/Reader/PdoReader.php b/src/Ddeboer/DataImport/Reader/PdoReader.php → src/Reader/PdoReader.php
diff --git a/...oer/DataImport/Reader/ReaderInterface.php → src/Reader/ReaderInterface.php b/...oer/DataImport/Reader/ReaderInterface.php → src/Reader/ReaderInterface.php
diff --git a/src/Ddeboer/DataImport/Result.php → src/Result.php b/src/Ddeboer/DataImport/Result.php → src/Result.php
diff --git a/...Ddeboer/DataImport/Step/ConverterStep.php → src/Step/ConverterStep.php b/...Ddeboer/DataImport/Step/ConverterStep.php → src/Step/ConverterStep.php
diff --git a/src/Ddeboer/DataImport/Step/FilterStep.php → src/Step/FilterStep.php b/src/Ddeboer/DataImport/Step/FilterStep.php → src/Step/FilterStep.php
diff --git a/src/Ddeboer/DataImport/Step/MappingStep.php → src/Step/MappingStep.php b/src/Ddeboer/DataImport/Step/MappingStep.php → src/Step/MappingStep.php
diff --git a/...DataImport/Step/PriorityStepInterface.php → src/Step/PriorityStepInterface.php b/...DataImport/Step/PriorityStepInterface.php → src/Step/PriorityStepInterface.php
diff --git a/...Ddeboer/DataImport/Step/StepInterface.php → src/Step/StepInterface.php b/...Ddeboer/DataImport/Step/StepInterface.php → src/Step/StepInterface.php
diff --git a/...Ddeboer/DataImport/Step/ValidatorStep.php → src/Step/ValidatorStep.php b/...Ddeboer/DataImport/Step/ValidatorStep.php → src/Step/ValidatorStep.php
diff --git a/...er/DataImport/Step/ValueConverterStep.php → src/Step/ValueConverterStep.php b/...er/DataImport/Step/ValueConverterStep.php → src/Step/ValueConverterStep.php
diff --git a/...ValueConverter/ArrayValueConverterMap.php → ...ValueConverter/ArrayValueConverterMap.php b/...ValueConverter/ArrayValueConverterMap.php → ...ValueConverter/ArrayValueConverterMap.php
diff --git a/.../ValueConverter/CharsetValueConverter.php → src/ValueConverter/CharsetValueConverter.php b/.../ValueConverter/CharsetValueConverter.php → src/ValueConverter/CharsetValueConverter.php
diff --git a/...ValueConverter/DateTimeValueConverter.php → ...ValueConverter/DateTimeValueConverter.php b/...ValueConverter/DateTimeValueConverter.php → ...ValueConverter/DateTimeValueConverter.php
diff --git a/.../ValueConverter/MappingValueConverter.php → src/ValueConverter/MappingValueConverter.php b/.../ValueConverter/MappingValueConverter.php → src/ValueConverter/MappingValueConverter.php
diff --git a/...Import/ValueConverter/ObjectConverter.php → src/ValueConverter/ObjectConverter.php b/...Import/ValueConverter/ObjectConverter.php → src/ValueConverter/ObjectConverter.php
diff --git a/...alueConverter/StringToObjectConverter.php → ...alueConverter/StringToObjectConverter.php b/...alueConverter/StringToObjectConverter.php → ...alueConverter/StringToObjectConverter.php
diff --git a/src/Ddeboer/DataImport/Workflow.php → src/Workflow.php b/src/Ddeboer/DataImport/Workflow.php → src/Workflow.php
diff --git a/src/Ddeboer/DataImport/WorkflowInterface.php → src/WorkflowInterface.php b/src/Ddeboer/DataImport/WorkflowInterface.php → src/WorkflowInterface.php
diff --git a/...ataImport/Writer/AbstractStreamWriter.php → src/Writer/AbstractStreamWriter.php b/...ataImport/Writer/AbstractStreamWriter.php → src/Writer/AbstractStreamWriter.php
diff --git a/...boer/DataImport/Writer/AbstractWriter.php → src/Writer/AbstractWriter.php b/...boer/DataImport/Writer/AbstractWriter.php → src/Writer/AbstractWriter.php
diff --git a/...Ddeboer/DataImport/Writer/ArrayWriter.php → src/Writer/ArrayWriter.php b/...Ddeboer/DataImport/Writer/ArrayWriter.php → src/Writer/ArrayWriter.php
diff --git a/...boer/DataImport/Writer/CallbackWriter.php → src/Writer/CallbackWriter.php b/...boer/DataImport/Writer/CallbackWriter.php → src/Writer/CallbackWriter.php
diff --git a/...taImport/Writer/ConsoleProgressWriter.php → src/Writer/ConsoleProgressWriter.php b/...taImport/Writer/ConsoleProgressWriter.php → src/Writer/ConsoleProgressWriter.php
diff --git a/.../DataImport/Writer/ConsoleTableWriter.php → src/Writer/ConsoleTableWriter.php b/.../DataImport/Writer/ConsoleTableWriter.php → src/Writer/ConsoleTableWriter.php
diff --git a/src/Ddeboer/DataImport/Writer/CsvWriter.php → src/Writer/CsvWriter.php b/src/Ddeboer/DataImport/Writer/CsvWriter.php → src/Writer/CsvWriter.php
diff --git a/...boer/DataImport/Writer/DoctrineWriter.php → src/Writer/DoctrineWriter.php b/...boer/DataImport/Writer/DoctrineWriter.php → src/Writer/DoctrineWriter.php
diff --git a/...Ddeboer/DataImport/Writer/ExcelWriter.php → src/Writer/ExcelWriter.php b/...Ddeboer/DataImport/Writer/ExcelWriter.php → src/Writer/ExcelWriter.php
diff --git a/src/Ddeboer/DataImport/Writer/PdoWriter.php → src/Writer/PdoWriter.php b/src/Ddeboer/DataImport/Writer/PdoWriter.php → src/Writer/PdoWriter.php
diff --git a/...r/DataImport/Writer/StreamMergeWriter.php → src/Writer/StreamMergeWriter.php b/...r/DataImport/Writer/StreamMergeWriter.php → src/Writer/StreamMergeWriter.php
diff --git a/...oer/DataImport/Writer/WriterInterface.php → src/Writer/WriterInterface.php b/...oer/DataImport/Writer/WriterInterface.php → src/Writer/WriterInterface.php
diff --git a/...mport/Tests/Filter/DateTimeFilterTest.php → tests/Filter/DateTimeFilterTest.php b/...mport/Tests/Filter/DateTimeFilterTest.php → tests/Filter/DateTimeFilterTest.php
diff --git a/...aImport/Tests/Filter/OffsetFilterTest.php → tests/Filter/OffsetFilterTest.php b/...aImport/Tests/Filter/OffsetFilterTest.php → tests/Filter/OffsetFilterTest.php
diff --git a/...ort/Tests/Filter/ValidationFilterTest.php → tests/Filter/ValidationFilterTest.php b/...ort/Tests/Filter/ValidationFilterTest.php → tests/Filter/ValidationFilterTest.php
diff --git a/...port/Tests/Fixtures/Entity/TestEntity.php → tests/Fixtures/Entity/TestEntity.php b/...port/Tests/Fixtures/Entity/TestEntity.php → tests/Fixtures/Entity/TestEntity.php
diff --git a/...DataImport/Tests/Fixtures/Entity/User.php → tests/Fixtures/Entity/User.php b/...DataImport/Tests/Fixtures/Entity/User.php → tests/Fixtures/Entity/User.php
diff --git a/...mport/Tests/Fixtures/data_blank_lines.csv → tests/Fixtures/data_blank_lines.csv b/...mport/Tests/Fixtures/data_blank_lines.csv → tests/Fixtures/data_blank_lines.csv
diff --git a/...rt/Tests/Fixtures/data_column_headers.csv → tests/Fixtures/data_column_headers.csv b/...rt/Tests/Fixtures/data_column_headers.csv → tests/Fixtures/data_column_headers.csv
diff --git a/...t/Tests/Fixtures/data_column_headers.xlsx → tests/Fixtures/data_column_headers.xlsx b/...t/Tests/Fixtures/data_column_headers.xlsx → tests/Fixtures/data_column_headers.xlsx
diff --git a/...xtures/data_column_headers_duplicates.csv → ...xtures/data_column_headers_duplicates.csv b/...xtures/data_column_headers_duplicates.csv → ...xtures/data_column_headers_duplicates.csv
diff --git a/..._column_headers_varying_element_count.csv → ..._column_headers_varying_element_count.csv b/..._column_headers_varying_element_count.csv → ..._column_headers_varying_element_count.csv
diff --git a/...aImport/Tests/Fixtures/data_cr_breaks.csv → tests/Fixtures/data_cr_breaks.csv b/...aImport/Tests/Fixtures/data_cr_breaks.csv → tests/Fixtures/data_cr_breaks.csv
diff --git a/...ta_fewer_elements_than_column_headers.csv → ...ta_fewer_elements_than_column_headers.csv b/...ta_fewer_elements_than_column_headers.csv → ...ta_fewer_elements_than_column_headers.csv
diff --git a/...ata_more_elements_than_column_headers.csv → ...ata_more_elements_than_column_headers.csv b/...ata_more_elements_than_column_headers.csv → ...ata_more_elements_than_column_headers.csv
diff --git a/...mport/Tests/Fixtures/data_multi_sheet.xls → tests/Fixtures/data_multi_sheet.xls b/...mport/Tests/Fixtures/data_multi_sheet.xls → tests/Fixtures/data_multi_sheet.xls
diff --git a/...Tests/Fixtures/data_no_column_headers.csv → tests/Fixtures/data_no_column_headers.csv b/...Tests/Fixtures/data_no_column_headers.csv → tests/Fixtures/data_no_column_headers.csv
diff --git a/...Tests/Fixtures/data_no_column_headers.xls → tests/Fixtures/data_no_column_headers.xls b/...Tests/Fixtures/data_no_column_headers.xls → tests/Fixtures/data_no_column_headers.xls
diff --git a/..._column_headers_varying_element_count.csv → ..._column_headers_varying_element_count.csv b/..._column_headers_varying_element_count.csv → ..._column_headers_varying_element_count.csv
diff --git a/...DataImport/Tests/Reader/CsvReaderTest.php → tests/Reader/CsvReaderTest.php b/...DataImport/Tests/Reader/CsvReaderTest.php → tests/Reader/CsvReaderTest.php
diff --git a/...ataImport/Tests/Reader/DbalReaderTest.php → tests/Reader/DbalReaderTest.php b/...ataImport/Tests/Reader/DbalReaderTest.php → tests/Reader/DbalReaderTest.php
diff --git a/...mport/Tests/Reader/DoctrineReaderTest.php → tests/Reader/DoctrineReaderTest.php b/...mport/Tests/Reader/DoctrineReaderTest.php → tests/Reader/DoctrineReaderTest.php
diff --git a/...taImport/Tests/Reader/ExcelReaderTest.php → tests/Reader/ExcelReaderTest.php b/...taImport/Tests/Reader/ExcelReaderTest.php → tests/Reader/ExcelReaderTest.php
diff --git a/...s/Reader/Factory/CsvReaderFactoryTest.php → ...s/Reader/Factory/CsvReaderFactoryTest.php b/...s/Reader/Factory/CsvReaderFactoryTest.php → ...s/Reader/Factory/CsvReaderFactoryTest.php
diff --git a/.../Reader/Factory/DbalReaderFactoryTest.php → .../Reader/Factory/DbalReaderFactoryTest.php b/.../Reader/Factory/DbalReaderFactoryTest.php → .../Reader/Factory/DbalReaderFactoryTest.php
diff --git a/...der/Factory/DoctrineReaderFactoryTest.php → ...der/Factory/DoctrineReaderFactoryTest.php b/...der/Factory/DoctrineReaderFactoryTest.php → ...der/Factory/DoctrineReaderFactoryTest.php
diff --git a/...Reader/Factory/ExcelReaderFactoryTest.php → ...Reader/Factory/ExcelReaderFactoryTest.php b/...Reader/Factory/ExcelReaderFactoryTest.php → ...Reader/Factory/ExcelReaderFactoryTest.php
diff --git a/...port/Tests/Reader/OneToManyReaderTest.php → tests/Reader/OneToManyReaderTest.php b/...port/Tests/Reader/OneToManyReaderTest.php → tests/Reader/OneToManyReaderTest.php
diff --git a/...DataImport/Tests/Reader/PdoReaderTest.php → tests/Reader/PdoReaderTest.php b/...DataImport/Tests/Reader/PdoReaderTest.php → tests/Reader/PdoReaderTest.php
diff --git a/...s/Ddeboer/DataImport/Tests/ResultTest.php → tests/ResultTest.php b/...s/Ddeboer/DataImport/Tests/ResultTest.php → tests/ResultTest.php
diff --git a/...taImport/Tests/Step/ConverterStepTest.php → tests/Step/ConverterStepTest.php b/...taImport/Tests/Step/ConverterStepTest.php → tests/Step/ConverterStepTest.php
diff --git a/.../DataImport/Tests/Step/FilterStepTest.php → tests/Step/FilterStepTest.php b/.../DataImport/Tests/Step/FilterStepTest.php → tests/Step/FilterStepTest.php
diff --git a/...DataImport/Tests/Step/MappingStepTest.php → tests/Step/MappingStepTest.php b/...DataImport/Tests/Step/MappingStepTest.php → tests/Step/MappingStepTest.php
diff --git a/...taImport/Tests/Step/ValidatorStepTest.php → tests/Step/ValidatorStepTest.php b/...taImport/Tests/Step/ValidatorStepTest.php → tests/Step/ValidatorStepTest.php
diff --git a/...ort/Tests/Step/ValueConverterStepTest.php → tests/Step/ValueConverterStepTest.php b/...ort/Tests/Step/ValueConverterStepTest.php → tests/Step/ValueConverterStepTest.php
diff --git a/...eConverter/ArrayValueConverterMapTest.php → ...eConverter/ArrayValueConverterMapTest.php b/...eConverter/ArrayValueConverterMapTest.php → ...eConverter/ArrayValueConverterMapTest.php
diff --git a/...ueConverter/CharsetValueConverterTest.php → ...ueConverter/CharsetValueConverterTest.php b/...ueConverter/CharsetValueConverterTest.php → ...ueConverter/CharsetValueConverterTest.php
diff --git a/...eConverter/DateTimeValueConverterTest.php → ...eConverter/DateTimeValueConverterTest.php b/...eConverter/DateTimeValueConverterTest.php → ...eConverter/DateTimeValueConverterTest.php
diff --git a/...ueConverter/MappingValueConverterTest.php → ...ueConverter/MappingValueConverterTest.php b/...ueConverter/MappingValueConverterTest.php → ...ueConverter/MappingValueConverterTest.php
diff --git a/...ts/ValueConverter/ObjectConverterTest.php → tests/ValueConverter/ObjectConverterTest.php b/...ts/ValueConverter/ObjectConverterTest.php → tests/ValueConverter/ObjectConverterTest.php
diff --git a/...Converter/StringToObjectConverterTest.php → ...Converter/StringToObjectConverterTest.php b/...Converter/StringToObjectConverterTest.php → ...Converter/StringToObjectConverterTest.php
diff --git a/...Ddeboer/DataImport/Tests/WorkflowTest.php → tests/WorkflowTest.php b/...Ddeboer/DataImport/Tests/WorkflowTest.php → tests/WorkflowTest.php
diff --git a/...Tests/Writer/AbstractStreamWriterTest.php → tests/Writer/AbstractStreamWriterTest.php b/...Tests/Writer/AbstractStreamWriterTest.php → tests/Writer/AbstractStreamWriterTest.php
diff --git a/...mport/Tests/Writer/CallbackWriterTest.php → tests/Writer/CallbackWriterTest.php b/...mport/Tests/Writer/CallbackWriterTest.php → tests/Writer/CallbackWriterTest.php
diff --git a/...ests/Writer/ConsoleProgressWriterTest.php → tests/Writer/ConsoleProgressWriterTest.php b/...ests/Writer/ConsoleProgressWriterTest.php → tests/Writer/ConsoleProgressWriterTest.php
diff --git a/...t/Tests/Writer/ConsoleTableWriterTest.php → tests/Writer/ConsoleTableWriterTest.php b/...t/Tests/Writer/ConsoleTableWriterTest.php → tests/Writer/ConsoleTableWriterTest.php
diff --git a/...DataImport/Tests/Writer/CsvWriterTest.php → tests/Writer/CsvWriterTest.php b/...DataImport/Tests/Writer/CsvWriterTest.php → tests/Writer/CsvWriterTest.php
diff --git a/...mport/Tests/Writer/DoctrineWriterTest.php → tests/Writer/DoctrineWriterTest.php b/...mport/Tests/Writer/DoctrineWriterTest.php → tests/Writer/DoctrineWriterTest.php
diff --git a/...taImport/Tests/Writer/ExcelWriterTest.php → tests/Writer/ExcelWriterTest.php b/...taImport/Tests/Writer/ExcelWriterTest.php → tests/Writer/ExcelWriterTest.php
diff --git a/...DataImport/Tests/Writer/PdoWriterTest.php → tests/Writer/PdoWriterTest.php b/...DataImport/Tests/Writer/PdoWriterTest.php → tests/Writer/PdoWriterTest.php
diff --git a/...rt/Tests/Writer/StreamMergeWriterTest.php → tests/Writer/StreamMergeWriterTest.php b/...rt/Tests/Writer/StreamMergeWriterTest.php → tests/Writer/StreamMergeWriterTest.php
diff --git a/...aImport/Tests/Writer/StreamWriterTest.php → tests/Writer/StreamWriterTest.php b/...aImport/Tests/Writer/StreamWriterTest.php → tests/Writer/StreamWriterTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php