Skip to content

Commit 2445e1d

Browse files
ruudboonruudboon
committed
Updated to Phalcon 4 RC-3
1 parent 3e5306e commit 2445e1d

File tree

532 files changed

+5948
-1743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

532 files changed

+5948
-1743
lines changed

‎plugin/META-INF/plugin.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<idea-plugin version="2">
22
<id>io.ruudboon.phpstorm-phalcon-4-autocomplete</id>
33
<name>Phalcon 4 Autocomplete</name>
4-
<version>4.0.0-rc.2</version>
4+
<version>4.0.0-rc.3</version>
55
<vendor email="[email protected]" url="https://github.com/ruudboon/phpstorm-phalcon-4-autocomplete">Ruud Boon</vendor>
66

77
<description><![CDATA[
88
Provides autocomplete functionality for Phalcon 4.
99
]]></description>
1010

1111
<change-notes><![CDATA[
12-
<h3>4.0.0-rc.2</h3>
12+
<h3>4.0.0-rc.3</h3>
1313
<ul>
14-
<li>Initial support of Phalcon V4</li>
14+
<li>IDE Stubs for Phalcon 4.0.0-rc.3</li>
1515
</ul>
1616
]]>
1717
</change-notes>

‎plugin/src/Phalcon/acl/adapter/AbstractAdapter.php renamed to ‎plugin/src/Phalcon/Acl/Adapter/AbstractAdapter.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl\Adapter;
411

512
use Phalcon\Events\ManagerInterface;
@@ -94,7 +101,7 @@ public function getDefaultAction(): int
94101
/**
95102
* Returns the internal event manager
96103
*
97-
* @return \Phalcon\Events\ManagerInterface
104+
* @return ManagerInterface
98105
*/
99106
public function getEventsManager(): ManagerInterface
100107
{
@@ -104,6 +111,7 @@ public function getEventsManager(): ManagerInterface
104111
* Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY)
105112
*
106113
* @param int $defaultAccess
114+
* @return void
107115
*/
108116
public function setDefaultAction(int $defaultAccess)
109117
{
@@ -113,6 +121,7 @@ public function setDefaultAction(int $defaultAccess)
113121
* Sets the events manager
114122
*
115123
* @param \Phalcon\Events\ManagerInterface $eventsManager
124+
* @return void
116125
*/
117126
public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager)
118127
{

‎plugin/src/Phalcon/acl/adapter/AdapterInterface.php renamed to ‎plugin/src/Phalcon/Acl/Adapter/AdapterInterface.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl\Adapter;
411

512
/**
@@ -55,6 +62,7 @@ public function addComponentAccess(string $componentName, $accessList): bool;
5562
* @param string $componentName
5663
* @param mixed $access
5764
* @param mixed $func
65+
* @return void
5866
*/
5967
public function allow(string $roleName, string $componentName, $access, $func = null);
6068

@@ -65,6 +73,7 @@ public function allow(string $roleName, string $componentName, $access, $func =
6573
* @param string $componentName
6674
* @param mixed $access
6775
* @param mixed $func
76+
* @return void
6877
*/
6978
public function deny(string $roleName, string $componentName, $access, $func = null);
7079

@@ -73,6 +82,7 @@ public function deny(string $roleName, string $componentName, $access, $func = n
7382
*
7483
* @param string $componentName
7584
* @param mixed $accessList
85+
* @return void
7686
*/
7787
public function dropComponentAccess(string $componentName, $accessList);
7888

@@ -117,14 +127,14 @@ public function getNoArgumentsDefaultAction(): int;
117127
/**
118128
* Return an array with every role registered in the list
119129
*
120-
* @return array|\Phalcon\Acl\RoleInterface[]
130+
* @return array
121131
*/
122132
public function getRoles(): array;
123133

124134
/**
125135
* Return an array with every component registered in the list
126136
*
127-
* @return array|\Phalcon\Acl\ComponentInterface[]
137+
* @return array
128138
*/
129139
public function getComponents(): array;
130140

@@ -159,6 +169,7 @@ public function isRole(string $roleName): bool;
159169
* Sets the default access level (Phalcon\Ac\Enuml::ALLOW or Phalcon\Acl\Enum::DENY)
160170
*
161171
* @param int $defaultAccess
172+
* @return void
162173
*/
163174
public function setDefaultAction(int $defaultAccess);
164175

@@ -168,6 +179,7 @@ public function setDefaultAction(int $defaultAccess);
168179
* accessKey
169180
*
170181
* @param int $defaultAccess
182+
* @return void
171183
*/
172184
public function setNoArgumentsDefaultAction(int $defaultAccess);
173185
}

‎plugin/src/Phalcon/acl/adapter/Memory.php renamed to ‎plugin/src/Phalcon/Acl/Adapter/Memory.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl\Adapter;
411

512
use Phalcon\Acl\Enum;
@@ -67,7 +74,7 @@
6774
* }
6875
* ```
6976
*/
70-
class Memory extends AbstractAdapter
77+
class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
7178
{
7279
/**
7380
* Access
@@ -298,6 +305,7 @@ public function addRole($role, $accessInherits = null): bool
298305
* @param string $componentName
299306
* @param mixed $access
300307
* @param mixed $func
308+
* @return void
301309
*/
302310
public function allow(string $roleName, string $componentName, $access, $func = null)
303311
{
@@ -324,6 +332,7 @@ public function allow(string $roleName, string $componentName, $access, $func =
324332
* @param string $componentName
325333
* @param mixed $access
326334
* @param mixed $func
335+
* @return void
327336
*/
328337
public function deny(string $roleName, string $componentName, $access, $func = null)
329338
{
@@ -334,6 +343,7 @@ public function deny(string $roleName, string $componentName, $access, $func = n
334343
*
335344
* @param string $componentName
336345
* @param mixed $accessList
346+
* @return void
337347
*/
338348
public function dropComponentAccess(string $componentName, $accessList)
339349
{
@@ -352,7 +362,7 @@ public function getNoArgumentsDefaultAction(): int
352362
/**
353363
* Return an array with every role registered in the list
354364
*
355-
* @return array|\Phalcon\Acl\RoleInterface[]
365+
* @return array
356366
*/
357367
public function getRoles(): array
358368
{
@@ -361,7 +371,7 @@ public function getRoles(): array
361371
/**
362372
* Return an array with every component registered in the list
363373
*
364-
* @return array|\Phalcon\Acl\ComponentInterface[]
374+
* @return array
365375
*/
366376
public function getComponents(): array
367377
{
@@ -414,6 +424,7 @@ public function isComponent(string $componentName): bool
414424
* accessKey
415425
*
416426
* @param int $defaultAccess
427+
* @return void
417428
*/
418429
public function setNoArgumentsDefaultAction(int $defaultAccess)
419430
{
@@ -427,6 +438,7 @@ public function setNoArgumentsDefaultAction(int $defaultAccess)
427438
* @param mixed $access
428439
* @param mixed $action
429440
* @param mixed $func
441+
* @return void
430442
*/
431443
private function allowOrDeny(string $roleName, string $componentName, $access, $action, $func = null)
432444
{

‎plugin/src/Phalcon/acl/Component.php renamed to ‎plugin/src/Phalcon/Acl/Component.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl;
411

512
/**

‎plugin/src/Phalcon/acl/ComponentAware.php renamed to ‎plugin/src/Phalcon/Acl/ComponentAware.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl;
411

512
/**

‎plugin/src/Phalcon/acl/ComponentInterface.php renamed to ‎plugin/src/Phalcon/Acl/ComponentInterface.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl;
411

512
/**

‎plugin/src/Phalcon/Acl/Enum.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
10+
namespace Phalcon\Acl;
11+
12+
/**
13+
* Constants for Phalcon\Acl\Adapter adapters
14+
*/
15+
class Enum
16+
{
17+
18+
const ALLOW = 1;
19+
20+
21+
const DENY = 0;
22+
}

‎plugin/src/Phalcon/factory/Exception.php renamed to ‎plugin/src/Phalcon/Acl/Exception.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?php
22

3-
namespace Phalcon\Factory;
4-
5-
/**
6-
* This file is part of the Phalcon Framework.
3+
/* This file is part of the Phalcon Framework.
74
*
85
* (c) Phalcon Team <[email protected]>
96
*
107
* For the full copyright and license information, please view the LICENSE.txt
118
* file that was distributed with this source code.
129
*/
10+
namespace Phalcon\Acl;
11+
12+
/**
13+
* Class for exceptions thrown by Phalcon\Acl
14+
*/
1315
class Exception extends \Phalcon\Exception
1416
{
1517

‎plugin/src/Phalcon/acl/Role.php renamed to ‎plugin/src/Phalcon/Acl/Role.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl;
411

512
/**

‎plugin/src/Phalcon/acl/RoleAware.php renamed to ‎plugin/src/Phalcon/Acl/RoleAware.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl;
411

512
/**

‎plugin/src/Phalcon/acl/RoleInterface.php renamed to ‎plugin/src/Phalcon/Acl/RoleInterface.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Acl;
411

512
/**

‎plugin/src/Phalcon/annotations/adapter/AbstractAdapter.php renamed to ‎plugin/src/Phalcon/Annotations/Adapter/AbstractAdapter.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/* This file is part of the Phalcon Framework.
4+
*
5+
* (c) Phalcon Team <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE.txt
8+
* file that was distributed with this source code.
9+
*/
310
namespace Phalcon\Annotations\Adapter;
411

512
use Phalcon\Annotations\Collection;
@@ -27,7 +34,7 @@ abstract class AbstractAdapter implements \Phalcon\Annotations\Adapter\AdapterIn
2734
* Parses or retrieves all the annotations found in a class
2835
*
2936
* @param mixed $className
30-
* @return \Phalcon\Annotations\Reflection
37+
* @return Reflection
3138
*/
3239
public function get($className): Reflection
3340
{
@@ -38,7 +45,7 @@ public function get($className): Reflection
3845
*
3946
* @param string $className
4047
* @param string $methodName
41-
* @return \Phalcon\Annotations\Collection
48+
* @return Collection
4249
*/
4350
public function getMethod(string $className, string $methodName): Collection
4451
{
@@ -59,7 +66,7 @@ public function getMethods(string $className): array
5966
*
6067
* @param string $className
6168
* @param string $propertyName
62-
* @return \Phalcon\Annotations\Collection
69+
* @return Collection
6370
*/
6471
public function getProperty(string $className, string $propertyName): Collection
6572
{
@@ -78,7 +85,7 @@ public function getProperties(string $className): array
7885
/**
7986
* Returns the annotation reader
8087
*
81-
* @return \Phalcon\Annotations\ReaderInterface
88+
* @return ReaderInterface
8289
*/
8390
public function getReader(): ReaderInterface
8491
{

0 commit comments

Comments
 (0)