Merge branch 'release/1.0.4'

composer.json

@@ -13,7 +13,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.3",
+		"php": ">=5.4",
 		"fzaninotto/faker": "~1.0",
 		"symfony/console": "~2.3"
 	},

src/Command/GenerateCommand.php

@@ -38,13 +38,15 @@ protected function configure()
 				'delimiter',
 				'd',
 				InputOption::VALUE_REQUIRED,
-				'The delimiter is used by the csv and printf format.'
+				'The delimiter is used by the csv and printf format.',
+				','
 			)
 			->addOption(
 				'enclosure',
 				'e',
 				InputOption::VALUE_REQUIRED,
-				'The enclosure is used by the csv and printf format.'
+				'The enclosure is used by the csv and printf format.',
+				'"'
 			)
 			->addOption(
 				'escape',
@@ -138,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 	 */
 	protected function outputJson(OutputInterface $output, $data)
 	{
-		$json = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+		$json = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
 		$output->write($json);
 	}
 
@@ -266,7 +268,7 @@ protected function outputPhp(OutputInterface $output, $data)
 	protected function outputPrintf(InputInterface $input, OutputInterface $output, $data)
 	{
 		$pattern   = $input->getOption('pattern');
-		$delimiter = $input->getOption('delimiter') ? : ',';
+		$delimiter = $input->getOption('delimiter');
 		$enclosure = $input->getOption('enclosure');
 		$escape    = $input->getOption('escape');