@@ -35,11 +35,11 @@ |
||
35 | 35 | */ |
36 | 36 | public function createInjection(\ReflectionClass $class, string $context = null) |
37 | 37 | { |
38 | - if (!$this->orm->getSchema()->defines($context)) { |
|
38 | + if (!$this->orm->getSchema()->defines($context)){ |
|
39 | 39 | $context = Inflector::singularize($context); |
40 | 40 | } |
41 | 41 | |
42 | - if (!$this->orm->getSchema()->defines($context)) { |
|
42 | + if (!$this->orm->getSchema()->defines($context)){ |
|
43 | 43 | throw new ORMException("Cycle schema is not initiated or role missing, run `cycle`"); |
44 | 44 | } |
45 | 45 |
@@ -35,11 +35,13 @@ |
||
35 | 35 | */ |
36 | 36 | public function createInjection(\ReflectionClass $class, string $context = null) |
37 | 37 | { |
38 | - if (!$this->orm->getSchema()->defines($context)) { |
|
38 | + if (!$this->orm->getSchema()->defines($context)) |
|
39 | + { |
|
39 | 40 | $context = Inflector::singularize($context); |
40 | 41 | } |
41 | 42 | |
42 | - if (!$this->orm->getSchema()->defines($context)) { |
|
43 | + if (!$this->orm->getSchema()->defines($context)) |
|
44 | + { |
|
43 | 45 | throw new ORMException("Cycle schema is not initiated or role missing, run `cycle`"); |
44 | 46 | } |
45 | 47 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | $services = $locator->getServices(); |
26 | 26 | |
27 | - if ($services === []) { |
|
27 | + if ($services === []){ |
|
28 | 28 | $this->writeln("<comment>No GRPC services were found.</comment>"); |
29 | 29 | return; |
30 | 30 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | 'File:', |
36 | 36 | ]); |
37 | 37 | |
38 | - foreach ($services as $interface => $instance) { |
|
38 | + foreach ($services as $interface => $instance){ |
|
39 | 39 | $grid->addRow([ |
40 | 40 | $interface::NAME, |
41 | 41 | get_class($instance), |
@@ -24,7 +24,8 @@ discard block |
||
24 | 24 | { |
25 | 25 | $services = $locator->getServices(); |
26 | 26 | |
27 | - if ($services === []) { |
|
27 | + if ($services === []) |
|
28 | + { |
|
28 | 29 | $this->writeln("<comment>No GRPC services were found.</comment>"); |
29 | 30 | return; |
30 | 31 | } |
@@ -35,7 +36,8 @@ discard block |
||
35 | 36 | 'File:', |
36 | 37 | ]); |
37 | 38 | |
38 | - foreach ($services as $interface => $instance) { |
|
39 | + foreach ($services as $interface => $instance) |
|
40 | + { |
|
39 | 41 | $grid->addRow([ |
40 | 42 | $interface::NAME, |
41 | 43 | get_class($instance), |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | public function perform(KernelInterface $kernel, FilesInterface $files, DirectoriesInterface $dirs) |
40 | 40 | { |
41 | 41 | $protoFile = $this->argument('proto'); |
42 | - if (!file_exists($protoFile)) { |
|
42 | + if (!file_exists($protoFile)){ |
|
43 | 43 | $this->sprintf("<error>File `%s` not found.</error>", $protoFile); |
44 | 44 | return; |
45 | 45 | } |
@@ -52,19 +52,19 @@ discard block |
||
52 | 52 | |
53 | 53 | $this->sprintf("<info>Compiling <fg=cyan>`%s`</fg=cyan>:</info>\n", $protoFile); |
54 | 54 | |
55 | - try { |
|
55 | + try{ |
|
56 | 56 | $result = $compiler->compile($protoFile); |
57 | - } catch (\Throwable $e) { |
|
57 | + }catch (\Throwable $e){ |
|
58 | 58 | $this->sprintf("<error>Error:</error> <fg=red>%s</fg=red>\n", $e->getMessage()); |
59 | 59 | return; |
60 | 60 | } |
61 | 61 | |
62 | - if ($result === []) { |
|
62 | + if ($result === []){ |
|
63 | 63 | $this->sprintf("<info>No files were generated.</info>\n", $protoFile); |
64 | 64 | return; |
65 | 65 | } |
66 | 66 | |
67 | - foreach ($result as $file) { |
|
67 | + foreach ($result as $file){ |
|
68 | 68 | $this->sprintf( |
69 | 69 | "<fg=green>•</fg=green> %s%s%s\n", |
70 | 70 | Color::LIGHT_WHITE, |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | protected function getPath(KernelInterface $kernel): string |
84 | 84 | { |
85 | 85 | $path = $this->argument('namespace'); |
86 | - if ($path !== 'auto') { |
|
86 | + if ($path !== 'auto'){ |
|
87 | 87 | return $path; |
88 | 88 | } |
89 | 89 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | protected function getNamespace(KernelInterface $kernel): string |
102 | 102 | { |
103 | 103 | $namespace = $this->argument('namespace'); |
104 | - if ($namespace !== 'auto') { |
|
104 | + if ($namespace !== 'auto'){ |
|
105 | 105 | return $namespace; |
106 | 106 | } |
107 | 107 |
@@ -39,7 +39,8 @@ discard block |
||
39 | 39 | public function perform(KernelInterface $kernel, FilesInterface $files, DirectoriesInterface $dirs) |
40 | 40 | { |
41 | 41 | $protoFile = $this->argument('proto'); |
42 | - if (!file_exists($protoFile)) { |
|
42 | + if (!file_exists($protoFile)) |
|
43 | + { |
|
43 | 44 | $this->sprintf("<error>File `%s` not found.</error>", $protoFile); |
44 | 45 | return; |
45 | 46 | } |
@@ -52,19 +53,24 @@ discard block |
||
52 | 53 | |
53 | 54 | $this->sprintf("<info>Compiling <fg=cyan>`%s`</fg=cyan>:</info>\n", $protoFile); |
54 | 55 | |
55 | - try { |
|
56 | + try |
|
57 | + { |
|
56 | 58 | $result = $compiler->compile($protoFile); |
57 | - } catch (\Throwable $e) { |
|
59 | + } |
|
60 | + catch (\Throwable $e) |
|
61 | + { |
|
58 | 62 | $this->sprintf("<error>Error:</error> <fg=red>%s</fg=red>\n", $e->getMessage()); |
59 | 63 | return; |
60 | 64 | } |
61 | 65 | |
62 | - if ($result === []) { |
|
66 | + if ($result === []) |
|
67 | + { |
|
63 | 68 | $this->sprintf("<info>No files were generated.</info>\n", $protoFile); |
64 | 69 | return; |
65 | 70 | } |
66 | 71 | |
67 | - foreach ($result as $file) { |
|
72 | + foreach ($result as $file) |
|
73 | + { |
|
68 | 74 | $this->sprintf( |
69 | 75 | "<fg=green>•</fg=green> %s%s%s\n", |
70 | 76 | Color::LIGHT_WHITE, |
@@ -83,7 +89,8 @@ discard block |
||
83 | 89 | protected function getPath(KernelInterface $kernel): string |
84 | 90 | { |
85 | 91 | $path = $this->argument('namespace'); |
86 | - if ($path !== 'auto') { |
|
92 | + if ($path !== 'auto') |
|
93 | + { |
|
87 | 94 | return $path; |
88 | 95 | } |
89 | 96 | |
@@ -101,7 +108,8 @@ discard block |
||
101 | 108 | protected function getNamespace(KernelInterface $kernel): string |
102 | 109 | { |
103 | 110 | $namespace = $this->argument('namespace'); |
104 | - if ($namespace !== 'auto') { |
|
111 | + if ($namespace !== 'auto') |
|
112 | + { |
|
105 | 113 | return $namespace; |
106 | 114 | } |
107 | 115 |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | GenerateMigrations $migrations, |
49 | 49 | Migrator $migrator, |
50 | 50 | Console $console |
51 | - ) { |
|
52 | - if (!$this->verifyConfigured()) { |
|
51 | + ){ |
|
52 | + if (!$this->verifyConfigured()){ |
|
53 | 53 | return; |
54 | 54 | } |
55 | 55 | |
56 | - foreach ($migrator->getMigrations() as $migration) { |
|
57 | - if ($migration->getState()->getStatus() !== State::STATUS_EXECUTED) { |
|
56 | + foreach ($migrator->getMigrations() as $migration){ |
|
57 | + if ($migration->getState()->getStatus() !== State::STATUS_EXECUTED){ |
|
58 | 58 | $this->writeln("<fg=red>Outstanding migrations found, run `migrate` first.</fg=red>"); |
59 | 59 | return; |
60 | 60 | } |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | |
70 | 70 | $memory->saveData('cycle', $schema); |
71 | 71 | |
72 | - if ($show->hasChanges()) { |
|
72 | + if ($show->hasChanges()){ |
|
73 | 73 | (new Compiler())->compile($registry, [$migrations]); |
74 | 74 | |
75 | - if ($this->option('run')) { |
|
75 | + if ($this->option('run')){ |
|
76 | 76 | $console->run('migrate', [], $this->output); |
77 | 77 | } |
78 | 78 | } |
@@ -49,12 +49,15 @@ discard block |
||
49 | 49 | Migrator $migrator, |
50 | 50 | Console $console |
51 | 51 | ) { |
52 | - if (!$this->verifyConfigured()) { |
|
52 | + if (!$this->verifyConfigured()) |
|
53 | + { |
|
53 | 54 | return; |
54 | 55 | } |
55 | 56 | |
56 | - foreach ($migrator->getMigrations() as $migration) { |
|
57 | - if ($migration->getState()->getStatus() !== State::STATUS_EXECUTED) { |
|
57 | + foreach ($migrator->getMigrations() as $migration) |
|
58 | + { |
|
59 | + if ($migration->getState()->getStatus() !== State::STATUS_EXECUTED) |
|
60 | + { |
|
58 | 61 | $this->writeln("<fg=red>Outstanding migrations found, run `migrate` first.</fg=red>"); |
59 | 62 | return; |
60 | 63 | } |
@@ -69,10 +72,12 @@ discard block |
||
69 | 72 | |
70 | 73 | $memory->saveData('cycle', $schema); |
71 | 74 | |
72 | - if ($show->hasChanges()) { |
|
75 | + if ($show->hasChanges()) |
|
76 | + { |
|
73 | 77 | (new Compiler())->compile($registry, [$migrations]); |
74 | 78 | |
75 | - if ($this->option('run')) { |
|
79 | + if ($this->option('run')) |
|
80 | + { |
|
76 | 81 | $console->run('migrate', [], $this->output); |
77 | 82 | } |
78 | 83 | } |
@@ -29,7 +29,8 @@ discard block |
||
29 | 29 | parent::tearDown(); |
30 | 30 | ini_set('error_log', 'stderr'); |
31 | 31 | |
32 | - if (file_exists(__DIR__ . '/err.log')) { |
|
32 | + if (file_exists(__DIR__ . '/err.log')) |
|
33 | + { |
|
33 | 34 | unlink(__DIR__ . '/err.log'); |
34 | 35 | } |
35 | 36 | } |
@@ -56,7 +57,8 @@ discard block |
||
56 | 57 | ); |
57 | 58 | |
58 | 59 | $psr->shouldReceive('respond')->once()->with( |
59 | - \Mockery::on(function ($r) { |
|
60 | + \Mockery::on(function ($r) |
|
61 | + { |
|
60 | 62 | $this->assertSame('Hello, dave.', (string)$r->getBody()); |
61 | 63 | return true; |
62 | 64 | }) |
@@ -78,7 +80,8 @@ discard block |
||
78 | 80 | ); |
79 | 81 | |
80 | 82 | $psr->shouldReceive('respond')->once()->with( |
81 | - \Mockery::on(function ($r) { |
|
83 | + \Mockery::on(function ($r) |
|
84 | + { |
|
82 | 85 | $this->assertContains('500', (string)$r->getBody()); |
83 | 86 | return true; |
84 | 87 | }) |
@@ -116,7 +119,8 @@ discard block |
||
116 | 119 | ); |
117 | 120 | |
118 | 121 | $psr->shouldReceive('respond')->once()->with( |
119 | - \Mockery::on(function ($r) { |
|
122 | + \Mockery::on(function ($r) |
|
123 | + { |
|
120 | 124 | $this->assertContains('undefined', (string)$r->getBody()); |
121 | 125 | return true; |
122 | 126 | }) |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | public function setUp() |
22 | 22 | { |
23 | 23 | parent::setUp(); |
24 | - ini_set('error_log', __DIR__ . '/err.log'); |
|
24 | + ini_set('error_log', __DIR__.'/err.log'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function tearDown() |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | parent::tearDown(); |
30 | 30 | ini_set('error_log', 'stderr'); |
31 | 31 | |
32 | - if (file_exists(__DIR__ . '/err.log')) { |
|
33 | - unlink(__DIR__ . '/err.log'); |
|
32 | + if (file_exists(__DIR__.'/err.log')){ |
|
33 | + unlink(__DIR__.'/err.log'); |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | ); |
57 | 57 | |
58 | 58 | $psr->shouldReceive('respond')->once()->with( |
59 | - \Mockery::on(function ($r) { |
|
59 | + \Mockery::on(function ($r){ |
|
60 | 60 | $this->assertSame('Hello, dave.', (string)$r->getBody()); |
61 | 61 | return true; |
62 | 62 | }) |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | ); |
79 | 79 | |
80 | 80 | $psr->shouldReceive('respond')->once()->with( |
81 | - \Mockery::on(function ($r) { |
|
81 | + \Mockery::on(function ($r){ |
|
82 | 82 | $this->assertContains('500', (string)$r->getBody()); |
83 | 83 | return true; |
84 | 84 | }) |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $psr->shouldReceive('acceptRequest')->once()->andReturn(null); |
88 | 88 | |
89 | 89 | $files = $this->app->get(FilesInterface::class)->getFiles( |
90 | - $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
90 | + $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
91 | 91 | ); |
92 | 92 | |
93 | 93 | $this->assertCount(0, $files); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $this->app->get(RrDispacher::class)->serve($psr); |
96 | 96 | |
97 | 97 | $files = $this->app->get(FilesInterface::class)->getFiles( |
98 | - $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
98 | + $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
99 | 99 | ); |
100 | 100 | |
101 | 101 | $this->assertCount(1, $files); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | ); |
117 | 117 | |
118 | 118 | $psr->shouldReceive('respond')->once()->with( |
119 | - \Mockery::on(function ($r) { |
|
119 | + \Mockery::on(function ($r){ |
|
120 | 120 | $this->assertContains('undefined', (string)$r->getBody()); |
121 | 121 | return true; |
122 | 122 | }) |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $psr->shouldReceive('acceptRequest')->once()->andReturn(null); |
126 | 126 | |
127 | 127 | $files = $this->app->get(FilesInterface::class)->getFiles( |
128 | - $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
128 | + $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
129 | 129 | ); |
130 | 130 | |
131 | 131 | $this->assertCount(0, $files); |
@@ -133,11 +133,11 @@ discard block |
||
133 | 133 | $this->app->get(RrDispacher::class)->serve($psr); |
134 | 134 | |
135 | 135 | $files = $this->app->get(FilesInterface::class)->getFiles( |
136 | - $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
136 | + $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
137 | 137 | ); |
138 | 138 | |
139 | 139 | $this->assertCount(1, $files); |
140 | 140 | |
141 | - $this->assertContains('undefined', file_get_contents(__DIR__ . '/err.log')); |
|
141 | + $this->assertContains('undefined', file_get_contents(__DIR__.'/err.log')); |
|
142 | 142 | } |
143 | 143 | } |
@@ -70,31 +70,31 @@ discard block |
||
70 | 70 | */ |
71 | 71 | private function configureExtensions(ConsoleBootloader $console, Container $container): void |
72 | 72 | { |
73 | - if ($container->has(DatabaseProviderInterface::class)) { |
|
73 | + if ($container->has(DatabaseProviderInterface::class)){ |
|
74 | 74 | $this->configureDatabase($console); |
75 | 75 | } |
76 | 76 | |
77 | - if ($container->has(ORMInterface::class)) { |
|
77 | + if ($container->has(ORMInterface::class)){ |
|
78 | 78 | $this->configureCycle($console, $container); |
79 | 79 | } |
80 | 80 | |
81 | - if ($container->has(TranslatorInterface::class)) { |
|
81 | + if ($container->has(TranslatorInterface::class)){ |
|
82 | 82 | $this->configureTranslator($console); |
83 | 83 | } |
84 | 84 | |
85 | - if ($container->has(ViewsInterface::class)) { |
|
85 | + if ($container->has(ViewsInterface::class)){ |
|
86 | 86 | $this->configureViews($console); |
87 | 87 | } |
88 | 88 | |
89 | - if ($container->has(Migrator::class)) { |
|
89 | + if ($container->has(Migrator::class)){ |
|
90 | 90 | $this->configureMigrations($console); |
91 | 91 | } |
92 | 92 | |
93 | - if ($container->has(InvokerInterface::class)) { |
|
93 | + if ($container->has(InvokerInterface::class)){ |
|
94 | 94 | $this->configureGRPC($console); |
95 | 95 | } |
96 | 96 | |
97 | - if ($container->has(EncryptionInterface::class)) { |
|
97 | + if ($container->has(EncryptionInterface::class)){ |
|
98 | 98 | $this->configureEncrypter($console); |
99 | 99 | } |
100 | 100 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | $console->addCommand(Cycle\SyncCommand::class); |
125 | 125 | |
126 | - if ($container->has(Migrator::class)) { |
|
126 | + if ($container->has(Migrator::class)){ |
|
127 | 127 | $console->addCommand(Cycle\MigrateCommand::class); |
128 | 128 | } |
129 | 129 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $console->addCommand(Translator\ResetCommand::class); |
139 | 139 | |
140 | 140 | $console->addConfigureSequence( |
141 | - function (FilesInterface $files, TranslatorConfig $config, OutputInterface $output) { |
|
141 | + function (FilesInterface $files, TranslatorConfig $config, OutputInterface $output){ |
|
142 | 142 | $files->ensureDirectory($config->getLocaleDirectory($config->getDefaultLocale())); |
143 | 143 | $output->writeln("<info>The default locale directory has been ensured.</info>"); |
144 | 144 | }, |
@@ -70,31 +70,38 @@ discard block |
||
70 | 70 | */ |
71 | 71 | private function configureExtensions(ConsoleBootloader $console, Container $container): void |
72 | 72 | { |
73 | - if ($container->has(DatabaseProviderInterface::class)) { |
|
73 | + if ($container->has(DatabaseProviderInterface::class)) |
|
74 | + { |
|
74 | 75 | $this->configureDatabase($console); |
75 | 76 | } |
76 | 77 | |
77 | - if ($container->has(ORMInterface::class)) { |
|
78 | + if ($container->has(ORMInterface::class)) |
|
79 | + { |
|
78 | 80 | $this->configureCycle($console, $container); |
79 | 81 | } |
80 | 82 | |
81 | - if ($container->has(TranslatorInterface::class)) { |
|
83 | + if ($container->has(TranslatorInterface::class)) |
|
84 | + { |
|
82 | 85 | $this->configureTranslator($console); |
83 | 86 | } |
84 | 87 | |
85 | - if ($container->has(ViewsInterface::class)) { |
|
88 | + if ($container->has(ViewsInterface::class)) |
|
89 | + { |
|
86 | 90 | $this->configureViews($console); |
87 | 91 | } |
88 | 92 | |
89 | - if ($container->has(Migrator::class)) { |
|
93 | + if ($container->has(Migrator::class)) |
|
94 | + { |
|
90 | 95 | $this->configureMigrations($console); |
91 | 96 | } |
92 | 97 | |
93 | - if ($container->has(InvokerInterface::class)) { |
|
98 | + if ($container->has(InvokerInterface::class)) |
|
99 | + { |
|
94 | 100 | $this->configureGRPC($console); |
95 | 101 | } |
96 | 102 | |
97 | - if ($container->has(EncryptionInterface::class)) { |
|
103 | + if ($container->has(EncryptionInterface::class)) |
|
104 | + { |
|
98 | 105 | $this->configureEncrypter($console); |
99 | 106 | } |
100 | 107 | } |
@@ -123,7 +130,8 @@ discard block |
||
123 | 130 | |
124 | 131 | $console->addCommand(Cycle\SyncCommand::class); |
125 | 132 | |
126 | - if ($container->has(Migrator::class)) { |
|
133 | + if ($container->has(Migrator::class)) |
|
134 | + { |
|
127 | 135 | $console->addCommand(Cycle\MigrateCommand::class); |
128 | 136 | } |
129 | 137 | } |
@@ -138,7 +146,8 @@ discard block |
||
138 | 146 | $console->addCommand(Translator\ResetCommand::class); |
139 | 147 | |
140 | 148 | $console->addConfigureSequence( |
141 | - function (FilesInterface $files, TranslatorConfig $config, OutputInterface $output) { |
|
149 | + function (FilesInterface $files, TranslatorConfig $config, OutputInterface $output) |
|
150 | + { |
|
142 | 151 | $files->ensureDirectory($config->getLocaleDirectory($config->getDefaultLocale())); |
143 | 152 | $output->writeln("<info>The default locale directory has been ensured.</info>"); |
144 | 153 | }, |
@@ -55,21 +55,21 @@ |
||
55 | 55 | $this->sprintf("<info>New encryption key:</info> <fg=cyan>%s</fg=cyan>\n", $key); |
56 | 56 | |
57 | 57 | $file = $this->option('mount'); |
58 | - if ($file === null) { |
|
58 | + if ($file === null){ |
|
59 | 59 | return; |
60 | 60 | } |
61 | 61 | |
62 | - if (!$files->exists($file)) { |
|
62 | + if (!$files->exists($file)){ |
|
63 | 63 | $this->sprintf("<error>Unable to find `%s`</error>", $file); |
64 | 64 | return; |
65 | 65 | } |
66 | 66 | |
67 | 67 | $content = $files->read($file); |
68 | 68 | |
69 | - try { |
|
69 | + try{ |
|
70 | 70 | $content = str_replace($this->option('placeholder'), $key, $content); |
71 | 71 | $content = str_replace($enc->getKey(), $key, $content); |
72 | - } catch (\Throwable $e) { |
|
72 | + }catch (\Throwable $e){ |
|
73 | 73 | // current keys is not set |
74 | 74 | } |
75 | 75 |
@@ -55,21 +55,26 @@ |
||
55 | 55 | $this->sprintf("<info>New encryption key:</info> <fg=cyan>%s</fg=cyan>\n", $key); |
56 | 56 | |
57 | 57 | $file = $this->option('mount'); |
58 | - if ($file === null) { |
|
58 | + if ($file === null) |
|
59 | + { |
|
59 | 60 | return; |
60 | 61 | } |
61 | 62 | |
62 | - if (!$files->exists($file)) { |
|
63 | + if (!$files->exists($file)) |
|
64 | + { |
|
63 | 65 | $this->sprintf("<error>Unable to find `%s`</error>", $file); |
64 | 66 | return; |
65 | 67 | } |
66 | 68 | |
67 | 69 | $content = $files->read($file); |
68 | 70 | |
69 | - try { |
|
71 | + try |
|
72 | + { |
|
70 | 73 | $content = str_replace($this->option('placeholder'), $key, $content); |
71 | 74 | $content = str_replace($enc->getKey(), $key, $content); |
72 | - } catch (\Throwable $e) { |
|
75 | + } |
|
76 | + catch (\Throwable $e) |
|
77 | + { |
|
73 | 78 | // current keys is not set |
74 | 79 | } |
75 | 80 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | public function setUp() |
20 | 20 | { |
21 | 21 | exec('protoc 2>&1', $out); |
22 | - if (strpos(join("\n", $out), '--php_out') === false) { |
|
22 | + if (strpos(join("\n", $out), '--php_out') === false){ |
|
23 | 23 | $this->markTestSkipped('Protoc binary is missing'); |
24 | 24 | return; |
25 | 25 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | parent::setUp(); |
28 | 28 | |
29 | 29 | $fs = new Files(); |
30 | - $this->proto = $fs->normalizePath($this->app->dir('app') . 'proto/service.proto'); |
|
30 | + $this->proto = $fs->normalizePath($this->app->dir('app').'proto/service.proto'); |
|
31 | 31 | |
32 | 32 | // protoc can't figure relative paths |
33 | 33 | $this->proto = str_replace('Framework/../', '', $this->proto); |
@@ -39,12 +39,12 @@ discard block |
||
39 | 39 | |
40 | 40 | $fs = new Files(); |
41 | 41 | |
42 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
43 | - $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
|
42 | + if ($fs->isDirectory($this->app->dir('app').'src/Service')){ |
|
43 | + $fs->deleteDirectory($this->app->dir('app').'src/Service'); |
|
44 | 44 | } |
45 | 45 | |
46 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
47 | - $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
|
46 | + if ($fs->isDirectory($this->app->dir('app').'src/GPBMetadata')){ |
|
47 | + $fs->deleteDirectory($this->app->dir('app').'src/GPBMetadata'); |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 | |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | 'proto' => $this->proto |
62 | 62 | ]); |
63 | 63 | |
64 | - file_put_contents($this->app->dir('app') . 'src/Service/EchoService.php', GenerateTest::SERVICE); |
|
64 | + file_put_contents($this->app->dir('app').'src/Service/EchoService.php', GenerateTest::SERVICE); |
|
65 | 65 | |
66 | 66 | $out = $this->runCommandDebug('grpc:services'); |
67 | 67 |
@@ -19,7 +19,8 @@ discard block |
||
19 | 19 | public function setUp() |
20 | 20 | { |
21 | 21 | exec('protoc 2>&1', $out); |
22 | - if (strpos(join("\n", $out), '--php_out') === false) { |
|
22 | + if (strpos(join("\n", $out), '--php_out') === false) |
|
23 | + { |
|
23 | 24 | $this->markTestSkipped('Protoc binary is missing'); |
24 | 25 | return; |
25 | 26 | } |
@@ -39,11 +40,13 @@ discard block |
||
39 | 40 | |
40 | 41 | $fs = new Files(); |
41 | 42 | |
42 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
43 | + if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) |
|
44 | + { |
|
43 | 45 | $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
44 | 46 | } |
45 | 47 | |
46 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
48 | + if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) |
|
49 | + { |
|
47 | 50 | $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
48 | 51 | } |
49 | 52 | } |
@@ -32,7 +32,8 @@ discard block |
||
32 | 32 | public function setUp() |
33 | 33 | { |
34 | 34 | exec('protoc 2>&1', $out); |
35 | - if (strpos(join("\n", $out), '--php_out') === false) { |
|
35 | + if (strpos(join("\n", $out), '--php_out') === false) |
|
36 | + { |
|
36 | 37 | $this->markTestSkipped('Protoc binary is missing'); |
37 | 38 | } |
38 | 39 | |
@@ -51,11 +52,13 @@ discard block |
||
51 | 52 | |
52 | 53 | $fs = new Files(); |
53 | 54 | |
54 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
55 | + if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) |
|
56 | + { |
|
55 | 57 | $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
56 | 58 | } |
57 | 59 | |
58 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
60 | + if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) |
|
61 | + { |
|
59 | 62 | $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
60 | 63 | } |
61 | 64 | } |
@@ -33,14 +33,14 @@ discard block |
||
33 | 33 | public function setUp() |
34 | 34 | { |
35 | 35 | exec('protoc 2>&1', $out); |
36 | - if (strpos(join("\n", $out), '--php_out') === false) { |
|
36 | + if (strpos(join("\n", $out), '--php_out') === false){ |
|
37 | 37 | $this->markTestSkipped('Protoc binary is missing'); |
38 | 38 | } |
39 | 39 | |
40 | 40 | parent::setUp(); |
41 | 41 | |
42 | 42 | $fs = new Files(); |
43 | - $this->proto = $fs->normalizePath($this->app->dir('app') . 'proto/service.proto'); |
|
43 | + $this->proto = $fs->normalizePath($this->app->dir('app').'proto/service.proto'); |
|
44 | 44 | |
45 | 45 | // protoc can't figure relative paths |
46 | 46 | $this->proto = str_replace('Framework/../', '', $this->proto); |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | |
53 | 53 | $fs = new Files(); |
54 | 54 | |
55 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
56 | - $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
|
55 | + if ($fs->isDirectory($this->app->dir('app').'src/Service')){ |
|
56 | + $fs->deleteDirectory($this->app->dir('app').'src/Service'); |
|
57 | 57 | } |
58 | 58 | |
59 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
60 | - $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
|
59 | + if ($fs->isDirectory($this->app->dir('app').'src/GPBMetadata')){ |
|
60 | + $fs->deleteDirectory($this->app->dir('app').'src/GPBMetadata'); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | 'proto' => $this->proto |
86 | 86 | ]); |
87 | 87 | |
88 | - $this->assertFileExists($this->app->dir('app') . 'src/Service/EchoInterface.php'); |
|
89 | - $this->assertFileExists($this->app->dir('app') . 'src/Service/Sub/Message.php'); |
|
90 | - $this->assertFileExists($this->app->dir('app') . 'src/GPBMetadata/Service.php'); |
|
88 | + $this->assertFileExists($this->app->dir('app').'src/Service/EchoInterface.php'); |
|
89 | + $this->assertFileExists($this->app->dir('app').'src/Service/Sub/Message.php'); |
|
90 | + $this->assertFileExists($this->app->dir('app').'src/GPBMetadata/Service.php'); |
|
91 | 91 | } |
92 | 92 | } |