@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return [ |
4 | - Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], |
|
5 | - Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true], |
|
6 | - Aimeos\ShopBundle\AimeosShopBundle::class => ['all' => true], |
|
4 | + Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], |
|
5 | + Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true], |
|
6 | + Aimeos\ShopBundle\AimeosShopBundle::class => ['all' => true], |
|
7 | 7 | ]; |
8 | 8 | \ No newline at end of file |
@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | |
43 | 43 | public function testFilterTree() |
44 | - { |
|
44 | + { |
|
45 | 45 | $client = static::createClient(); |
46 | 46 | $crawler = $client->request( 'GET', '/unittest/de/EUR/shop/' ); |
47 | 47 |
@@ -11,7 +11,7 @@ |
||
11 | 11 | /** |
12 | 12 | * {@inheritdoc} |
13 | 13 | */ |
14 | - public function registerBundles() : \Traversable|array |
|
14 | + public function registerBundles() : \Traversable | array |
|
15 | 15 | { |
16 | 16 | return array( |
17 | 17 | new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(), |
@@ -75,9 +75,12 @@ |
||
75 | 75 | { |
76 | 76 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
77 | 77 | |
78 | - try { |
|
78 | + try |
|
79 | + { |
|
79 | 80 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
80 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
81 | + } |
|
82 | + catch( \Aimeos\MShop\Exception $e ) |
|
83 | + { |
|
81 | 84 | $localeItem = $localeManager->create(); |
82 | 85 | } |
83 | 86 |
@@ -93,7 +93,7 @@ |
||
93 | 93 | */ |
94 | 94 | protected function addCache( \Aimeos\MShop\ContextIface $context ) |
95 | 95 | { |
96 | - $cache = (new \Aimeos\MAdmin\Cache\Manager\Standard( $context ))->getCache(); |
|
96 | + $cache = ( new \Aimeos\MAdmin\Cache\Manager\Standard( $context ) )->getCache(); |
|
97 | 97 | |
98 | 98 | return $context->setCache( $cache ); |
99 | 99 | } |
@@ -248,8 +248,7 @@ |
||
248 | 248 | $username = $token->getUser()->getUserIdentifier(); |
249 | 249 | $userid = $token->getUser()->getId(); |
250 | 250 | $context->setUserId( $userid ); |
251 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
252 | - { |
|
251 | + $context->setGroupIds( function() use ( $context, $userid ) { |
|
253 | 252 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
254 | 253 | return $manager->get( $userid, array( 'customer/group' ) )->getGroups(); |
255 | 254 | } ); |
@@ -97,8 +97,7 @@ discard block |
||
97 | 97 | && in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) ) |
98 | 98 | { |
99 | 99 | $helper = new \Aimeos\Base\View\Helper\Access\All( $view ); |
100 | - } |
|
101 | - else |
|
100 | + } else |
|
102 | 101 | { |
103 | 102 | $container = $this->container; |
104 | 103 | |
@@ -140,9 +139,12 @@ discard block |
||
140 | 139 | */ |
141 | 140 | protected function addCsrf( \Aimeos\Base\View\Iface $view ) |
142 | 141 | { |
143 | - try { |
|
142 | + try |
|
143 | + { |
|
144 | 144 | $token = $this->tokenManager->getToken( '_token' )->getValue(); |
145 | - } catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) { |
|
145 | + } |
|
146 | + catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) |
|
147 | + { |
|
146 | 148 | $token = ''; |
147 | 149 | } |
148 | 150 | |
@@ -258,8 +260,7 @@ discard block |
||
258 | 260 | { |
259 | 261 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
260 | 262 | $translation = $i18n[$locale]; |
261 | - } |
|
262 | - else |
|
263 | + } else |
|
263 | 264 | { |
264 | 265 | $translation = new \Aimeos\Base\Translation\None( 'en' ); |
265 | 266 | } |
@@ -235,14 +235,15 @@ |
||
235 | 235 | { |
236 | 236 | \Composer\Factory::createHttpDownloader( $event->getIO(), $config ) |
237 | 237 | ->get( 'https://api.github.com/graphql', $options ); |
238 | - } |
|
239 | - else |
|
238 | + } else |
|
240 | 239 | { |
241 | 240 | \Composer\Factory::createRemoteFilesystem( $event->getIO(), $config ) |
242 | 241 | ->getContents( 'github.com', 'https://api.github.com/graphql', false, $options ); |
243 | 242 | } |
244 | 243 | } |
245 | - catch( \Exception $e ) {} |
|
244 | + catch( \Exception $e ) |
|
245 | + { |
|
246 | +} |
|
246 | 247 | } |
247 | 248 | |
248 | 249 |
@@ -158,11 +158,11 @@ |
||
158 | 158 | /** |
159 | 159 | * @inheritDoc |
160 | 160 | */ |
161 | - public function setPassword(string $password): self |
|
162 | - { |
|
163 | - $this->password = $password; |
|
164 | - return $this; |
|
165 | - } |
|
161 | + public function setPassword(string $password): self |
|
162 | + { |
|
163 | + $this->password = $password; |
|
164 | + return $this; |
|
165 | + } |
|
166 | 166 | |
167 | 167 | |
168 | 168 | /** |
@@ -14,102 +14,102 @@ discard block |
||
14 | 14 | use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; |
15 | 15 | |
16 | 16 | |
17 | -#[ORM\Entity(repositoryClass: UserRepository::class)] |
|
17 | +#[ORM\Entity( repositoryClass: UserRepository::class )] |
|
18 | 18 | class User implements UserInterface |
19 | 19 | { |
20 | 20 | #[ORM\Id] |
21 | - #[ORM\Column(name: "id", type: "integer")] |
|
22 | - #[ORM\GeneratedValue(strategy: "AUTO")] |
|
21 | + #[ORM\Column( name: "id", type: "integer" )] |
|
22 | + #[ORM\GeneratedValue( strategy: "AUTO" )] |
|
23 | 23 | protected $id; |
24 | 24 | |
25 | - #[ORM\Column(name: "siteid", type: "string", length: 255)] |
|
25 | + #[ORM\Column( name: "siteid", type: "string", length: 255 )] |
|
26 | 26 | protected $siteid; |
27 | 27 | |
28 | - #[ORM\Column(name: "label", type: "string", length: 255)] |
|
28 | + #[ORM\Column( name: "label", type: "string", length: 255 )] |
|
29 | 29 | protected $label; |
30 | 30 | |
31 | - #[ORM\Column(name: "code", type: "string", length: 255)] |
|
31 | + #[ORM\Column( name: "code", type: "string", length: 255 )] |
|
32 | 32 | protected $username; |
33 | 33 | |
34 | - #[ORM\Column(name: "password", type: "string", length: 255)] |
|
34 | + #[ORM\Column( name: "password", type: "string", length: 255 )] |
|
35 | 35 | protected $password; |
36 | 36 | |
37 | - #[ORM\Column(name: "status", type: "smallint")] |
|
37 | + #[ORM\Column( name: "status", type: "smallint" )] |
|
38 | 38 | protected $isActive; |
39 | 39 | |
40 | - #[ORM\Column(name: "salutation", type: "string", length: 8)] |
|
40 | + #[ORM\Column( name: "salutation", type: "string", length: 8 )] |
|
41 | 41 | protected $salutation = ''; |
42 | 42 | |
43 | - #[ORM\Column(name: "company", type: "string", length: 100)] |
|
43 | + #[ORM\Column( name: "company", type: "string", length: 100 )] |
|
44 | 44 | protected $company = ''; |
45 | 45 | |
46 | - #[ORM\Column(name: "vatid", type: "string", length: 32)] |
|
46 | + #[ORM\Column( name: "vatid", type: "string", length: 32 )] |
|
47 | 47 | protected $vatid = ''; |
48 | 48 | |
49 | - #[ORM\Column(name: "title", type: "string", length: 64)] |
|
49 | + #[ORM\Column( name: "title", type: "string", length: 64 )] |
|
50 | 50 | protected $title = ''; |
51 | 51 | |
52 | - #[ORM\Column(name: "firstname", type: "string", length: 64)] |
|
52 | + #[ORM\Column( name: "firstname", type: "string", length: 64 )] |
|
53 | 53 | protected $firstname = ''; |
54 | 54 | |
55 | - #[ORM\Column(name: "lastname", type: "string", length: 64)] |
|
55 | + #[ORM\Column( name: "lastname", type: "string", length: 64 )] |
|
56 | 56 | protected $lastname = ''; |
57 | 57 | |
58 | - #[ORM\Column(name: "address1", type: "string", length: 200)] |
|
58 | + #[ORM\Column( name: "address1", type: "string", length: 200 )] |
|
59 | 59 | protected $address1 = ''; |
60 | 60 | |
61 | - #[ORM\Column(name: "address2", type: "string", length: 200)] |
|
61 | + #[ORM\Column( name: "address2", type: "string", length: 200 )] |
|
62 | 62 | protected $address2 = ''; |
63 | 63 | |
64 | - #[ORM\Column(name: "address3", type: "string", length: 200)] |
|
64 | + #[ORM\Column( name: "address3", type: "string", length: 200 )] |
|
65 | 65 | protected $address3 = ''; |
66 | 66 | |
67 | - #[ORM\Column(name: "postal", type: "string", length: 16)] |
|
67 | + #[ORM\Column( name: "postal", type: "string", length: 16 )] |
|
68 | 68 | protected $postal = ''; |
69 | 69 | |
70 | - #[ORM\Column(name: "city", type: "string", length: 200)] |
|
70 | + #[ORM\Column( name: "city", type: "string", length: 200 )] |
|
71 | 71 | protected $city = ''; |
72 | 72 | |
73 | - #[ORM\Column(name: "state", type: "string", length: 200)] |
|
73 | + #[ORM\Column( name: "state", type: "string", length: 200 )] |
|
74 | 74 | protected $state = ''; |
75 | 75 | |
76 | - #[ORM\Column(name: "langid", type: "string", length: 5, nullable: true)] |
|
76 | + #[ORM\Column( name: "langid", type: "string", length: 5, nullable: true )] |
|
77 | 77 | protected $langid = ''; |
78 | 78 | |
79 | - #[ORM\Column(name: "countryid", type: "string", length: 2, nullable: true)] |
|
79 | + #[ORM\Column( name: "countryid", type: "string", length: 2, nullable: true )] |
|
80 | 80 | protected $countryid = ''; |
81 | 81 | |
82 | - #[ORM\Column(name: "telephone", type: "string", length: 32)] |
|
82 | + #[ORM\Column( name: "telephone", type: "string", length: 32 )] |
|
83 | 83 | protected $telephone = ''; |
84 | 84 | |
85 | - #[ORM\Column(name: "telefax", type: "string", length: 32)] |
|
85 | + #[ORM\Column( name: "telefax", type: "string", length: 32 )] |
|
86 | 86 | protected $telefax = ''; |
87 | 87 | |
88 | - #[ORM\Column(name: "email", type: "string", length: 255)] |
|
88 | + #[ORM\Column( name: "email", type: "string", length: 255 )] |
|
89 | 89 | protected $email = ''; |
90 | 90 | |
91 | - #[ORM\Column(name: "website", type: "string", length: 255)] |
|
91 | + #[ORM\Column( name: "website", type: "string", length: 255 )] |
|
92 | 92 | protected $website = ''; |
93 | 93 | |
94 | - #[ORM\Column(name: "longitude", type: "decimal", precision: 8, scale: 6, nullable: true)] |
|
94 | + #[ORM\Column( name: "longitude", type: "decimal", precision: 8, scale: 6, nullable: true )] |
|
95 | 95 | protected $longitude; |
96 | 96 | |
97 | - #[ORM\Column(name: "latitude", type: "decimal", precision: 8, scale: 6, nullable: true)] |
|
97 | + #[ORM\Column( name: "latitude", type: "decimal", precision: 8, scale: 6, nullable: true )] |
|
98 | 98 | protected $latitude; |
99 | 99 | |
100 | - #[ORM\Column(name: "birthday", type: "date", nullable: true)] |
|
100 | + #[ORM\Column( name: "birthday", type: "date", nullable: true )] |
|
101 | 101 | protected $birthday; |
102 | 102 | |
103 | - #[ORM\Column(name: "vdate", type: "date", nullable: true)] |
|
103 | + #[ORM\Column( name: "vdate", type: "date", nullable: true )] |
|
104 | 104 | protected $vdate; |
105 | 105 | |
106 | - #[ORM\Column(name: "ctime", type: "datetime")] |
|
106 | + #[ORM\Column( name: "ctime", type: "datetime" )] |
|
107 | 107 | protected $ctime; |
108 | 108 | |
109 | - #[ORM\Column(name: "mtime", type: "datetime")] |
|
109 | + #[ORM\Column( name: "mtime", type: "datetime" )] |
|
110 | 110 | protected $mtime; |
111 | 111 | |
112 | - #[ORM\Column(type: 'string', length: 180, unique: true)] |
|
112 | + #[ORM\Column( type: 'string', length: 180, unique: true )] |
|
113 | 113 | protected $editor = ''; |
114 | 114 | |
115 | 115 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | /** |
159 | 159 | * @inheritDoc |
160 | 160 | */ |
161 | - public function setPassword(string $password): self |
|
161 | + public function setPassword( string $password ): self |
|
162 | 162 | { |
163 | 163 | $this->password = $password; |
164 | 164 | return $this; |
@@ -23,7 +23,7 @@ |
||
23 | 23 | * @package symfony |
24 | 24 | * @subpackage Command |
25 | 25 | */ |
26 | -#[AsCommand(name: 'aimeos:jobs', description: 'Executes the job controllers')] |
|
26 | +#[AsCommand( name: 'aimeos:jobs', description: 'Executes the job controllers' )] |
|
27 | 27 | class JobsCommand extends Command |
28 | 28 | { |
29 | 29 | private $container; |