Permalink
Browse files

Random fixes, temporarlly disable CLDR.

  • Loading branch information...
umpirsky committed Aug 1, 2012
1 parent 69a00d9 commit 79c1b9048d8137f4cf5c4f6ff7813d924f853a9d
View
@@ -1,26 +1,24 @@
{
- "repositories": [
- {
- "type": "composer",
- "url": "http://packages.zendframework.com/"
- }
- ],
"require": {
"php": ">=5.3.2",
- "symfony/class-loader": "dev-master",
- "symfony/console": "dev-master",
- "symfony/filesystem": "dev-master",
- "symfony/finder": "dev-master",
- "symfony/locale": "dev-master",
- "symfony/yaml": "dev-master",
- "doctrine/dbal": "dev-master",
- "zendframework/zend-db": "dev-master"
+ "symfony/class-loader": "dev-master",
+ "symfony/console": "dev-master",
+ "symfony/filesystem": "dev-master",
+ "symfony/finder": "dev-master",
+ "symfony/locale": "dev-master",
+ "symfony/yaml": "dev-master",
+ "doctrine/dbal": "dev-master",
+ "zendframework/zend-db": "dev-master",
+ "zendframework/zend-i18n": "dev-master"
},
"minimum-stability": "dev",
"autoload": {
"psr-0": {
"Umpirsky\\Country": "src/"
}
+ },
+ "config": {
+ "process-timeout": 1000
}
}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -16,7 +16,7 @@ use Umpirsky\Country\Builder\Builder;
* Country list command line build interface.
*/
-require_once __DIR__ . '/autoload.php';
+include __DIR__ . '/vendor/autoload.php';
$builder = new Builder(__DIR__.'/country');
$builder->run();
@@ -89,18 +89,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
$verbose = $input->getOption('verbose');
foreach ($this->importerIterator as $importer) {
if (null === $input->getArgument('source') || $input->getArgument('source') === $importer->getSource()) {
- $this->filesystem->mkdir($importerDir = sprintf('%s/%s', $this->path, $importer->getSource()));
+ $this->filesystem->mkdir($importerDir = $this->path.'/'.$importer->getSource());
foreach ($importer->getLanguages() as $language) {
if (null === $input->getArgument('language') || $input->getArgument('language') === $language) {
- $this->filesystem->mkdir($exporterDir = sprintf('%s/%s', $importerDir, $language));
+ $this->filesystem->mkdir($exporterDir = $importerDir.'/'.$language);
$countries = $importer->getCountries($language);
foreach ($this->exporterIterator as $exporter) {
if (null === $input->getArgument('format') || $input->getArgument('format') === $exporter->getFormat()) {
- $file = sprintf('%s/country.%s', $exporterDir, $exporter->getFormat());
+ $file = $exporterDir.'/country.'.$exporter->getFormat();
$this->filesystem->touch($file);
file_put_contents($file, $exporter->export($countries));
if ($verbose) {
- $output->write(sprintf('<info>[file+]</info> %s%s', $file, PHP_EOL));
+ $output->write('<info>[file+]</info> '.$file.PHP_EOL);
}
}
}
@@ -40,7 +40,7 @@ public function export(array $data)
*/
public function getFormat()
{
- return parent::getFormat().'%s.sql';
+ return parent::getFormat().'.sql';
}
/**
@@ -33,6 +33,9 @@ public function __construct()
$this->importers = array();
foreach ($iterator as $file) {
+ if ('Cldr.php' === $file->getFilename()) {
+ continue; // Temporary fix since Cldr is removed from Zend Framework
+ }
$importerClassName = '\\Umpirsky\\Country\\Importer\\Source\\'.strstr($file->getFilename(), '.', true);
$this->attach(new $importerClassName());
}

0 comments on commit 79c1b90

Please sign in to comment.