Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from phalcon:master #14

Open
wants to merge 1,482 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
1482 commits
Select commit Hold shift + click to select a range
f6319f1
#16477 - Add digits check
Jeckerson Dec 23, 2023
7c00830
#16477 - Skip working tests with warnings in PHP8.3
Jeckerson Dec 23, 2023
64f9acd
#16477 - Update min version to 8.0
Jeckerson Dec 23, 2023
d9daf3a
#16477 - Bump `ZEPHIR_PARSER_VERSION` to `1.6.0`
Jeckerson Dec 23, 2023
54fda50
#16477 - Update PHP versions matrix
Jeckerson Dec 23, 2023
7349e8a
#16477 - Change template to use Zephir via composer
Jeckerson Dec 23, 2023
4de4592
#16477 - Adjust return types `bool` -> `false`
Jeckerson Dec 23, 2023
3ef9721
#16477 - Update CHANGELOG-5.0.md
Jeckerson Dec 23, 2023
dac4d38
#16477 - Shift minimal PHP version requirements
Jeckerson Dec 23, 2023
5fe0d76
#16477 - Update PHP versions matrix
Jeckerson Dec 23, 2023
c6ebd59
#16477 - Remove 7.4 from Windows matrix
Jeckerson Dec 23, 2023
6fc9f4f
#16477 - Update `vimeo/psalm` to latest
Jeckerson Dec 23, 2023
2ad33cb
#16477 - Suppress `MissingTemplateParam` issue
Jeckerson Dec 23, 2023
94ee748
#16477 - Update composer.lock
Jeckerson Dec 23, 2023
6af02d5
#16477 - Change return type of `Phalcon\Config\Adapter\Ini::cast()` t…
Jeckerson Dec 23, 2023
647e491
#16477 - Mass rename parameters to match `ParamNameMismatch` Psalm rule
Jeckerson Dec 23, 2023
6e00fe0
#16477 - Add return type
Jeckerson Dec 23, 2023
ad075d9
#16477 - Update composer.lock
Jeckerson Dec 23, 2023
a5b58db
#16477 - Add '--ignore-platform-reqs' flag
Jeckerson Dec 23, 2023
12bbf0e
#16477 - Add return type
Jeckerson Dec 23, 2023
40d7a2c
#16477 - Remove '--ignore-platform-reqs' flag
Jeckerson Dec 23, 2023
e2b05e1
#16477 - Temporary disable PHP 8.1 for Windows
Jeckerson Dec 23, 2023
5853914
#16477 - Remove `install-zephir.sh`
Jeckerson Dec 23, 2023
e34ccf8
#16477 - Regenerate ext/ directory
Jeckerson Dec 23, 2023
4c9e06f
#16477 - Remove mentions of `ZEPHIR_VERSION` env variable
Jeckerson Dec 23, 2023
b4d4d7e
Merge pull request #16478 from phalcon/#16477-php83
niden Dec 24, 2023
fac4ef4
documentation/docblock fixes
niden Dec 24, 2023
481c54e
updating composer and docker commands
niden Dec 24, 2023
83a1e12
bump version to 5.5.0
niden Dec 24, 2023
ac7e6a4
regenerating ext
niden Dec 24, 2023
394b14c
Merge pull request #16479 from niden/5.0.x
niden Dec 25, 2023
4d7b819
Merge pull request #16482 from phalcon/5.0.x
niden Dec 25, 2023
4e009e1
prepping changelog for 5.5.1
niden Dec 26, 2023
3debc43
removing 'order' from 'count()
niden Dec 26, 2023
ba5cac0
added tests
niden Dec 26, 2023
5a7d943
phpcs
niden Dec 26, 2023
91e37a5
updating changelog
niden Dec 26, 2023
a71fa61
fixing tests
niden Dec 26, 2023
1f9f4cf
minor adjustment
niden Dec 26, 2023
54fd67f
sqlite test correction
niden Dec 26, 2023
aca7e22
trying to fix this test again
niden Dec 26, 2023
458e4a9
trying to remove warnings from the run
niden Dec 26, 2023
93d302b
trying a different approach for the path
niden Dec 26, 2023
1214a26
maybe this syntax?
niden Dec 26, 2023
3281f92
changing inputs for actions
niden Dec 26, 2023
53b6096
another try
niden Dec 26, 2023
a874279
reverting back
niden Dec 26, 2023
f22fc27
removing local variable
niden Dec 26, 2023
34e1620
correcting variable name
niden Dec 26, 2023
a98908e
Merge pull request #16485 from niden/T16471-count-orderby
niden Dec 26, 2023
f521a8f
correcting links in readme
niden Dec 26, 2023
b6b0c8b
moved code to abstractadapter; set PDO stringify and emulate_prepares…
niden Dec 27, 2023
92f1fd7
refreshing ext
niden Dec 27, 2023
7c2456e
updating changelog
niden Dec 27, 2023
2f2f769
removed constructor - leaving things as they are with PDO
niden Dec 27, 2023
97f2c69
updating changelog
niden Dec 27, 2023
87039f7
adjusting test
niden Dec 27, 2023
043a91a
Merge pull request #16486 from niden/T16474-emulate-prepares
niden Dec 27, 2023
48d7102
Model::toArray added parameter to ignore getters
rudiservo Jan 4, 2024
7dadae8
Update docs links to current working URLs
petk Jan 4, 2024
7212ba0
Merge pull request #16491 from rudiservo/i16490-model-toarray-serialize
niden Jan 4, 2024
33fb1ca
Merge pull request #16492 from petk/patch-install-docs
niden Jan 4, 2024
ffeb995
Added return type for getReusableRecords
Jan 5, 2024
f46bf4e
Removed property comments in Select
Jan 5, 2024
8793a7f
Merge branch '5.0.x' into manager-return-types
niden Jan 5, 2024
750f56c
Merge pull request #16493 from kuhler-Stratege/manager-return-types
niden Jan 5, 2024
4a0a419
Merge pull request #16494 from kuhler-Stratege/select-delete-property…
niden Jan 5, 2024
7228f4d
documentation corrections and test addition
niden Dec 30, 2023
5da0657
mostly docblock corrections; returning self from datamapper
niden Jan 6, 2024
7dde460
correcting return types for reset
niden Jan 6, 2024
cbfb63a
reverting return types for datamapper
niden Jan 6, 2024
34b0acd
correcting return type for select
niden Jan 6, 2024
c2cf8e0
fixed apcu_* methods to ignore referenced values
niden Jan 6, 2024
3c13ddb
regenerating ext and build
niden Jan 6, 2024
9bb774a
Merge pull request #16497 from niden/T16489-apcu-fetch-2
Jeckerson Jan 7, 2024
379040f
reworking the toarray conditionals
niden Jan 9, 2024
d9be887
Merge pull request #16499 from niden/T16498-model-toarray-segfault
niden Jan 9, 2024
9606bfa
bumping version
niden Jan 9, 2024
a2222ee
updating version
niden Jan 9, 2024
087e70d
refreshing ext
niden Jan 9, 2024
28c9a04
Merge pull request #16500 from niden/5.0.x
Jeckerson Jan 9, 2024
18a9ac7
bumping to 5.6
niden Jan 9, 2024
c21137d
regenerating ext
niden Jan 9, 2024
e0c7f8e
updating changelog
niden Jan 9, 2024
eb1c97d
updating package description
niden Jan 9, 2024
feaa3de
Merge pull request #16503 from niden/5.0.x
niden Jan 9, 2024
a9f537a
Merge pull request #16504 from phalcon/5.0.x
niden Jan 9, 2024
6b200c4
Update Postgresql.zep
fbclol Jul 5, 2023
acef7ee
fix regex
fbclol Jul 5, 2023
3e7f8cd
updating changelog
niden Jan 11, 2024
0be989f
Merge pull request #16507 from niden/T16371-postgres-fix
niden Jan 11, 2024
1bd44bf
Revert "T16371 postgres fix"
niden Jan 11, 2024
e14ab77
Merge pull request #16508 from phalcon/revert-16507-T16371-postgres-fix
niden Jan 11, 2024
5145d88
Merge pull request #16509 from niden/T16371-postgres-fix
niden Jan 11, 2024
e96b3f1
Update Router.zep
zikezhang Apr 21, 2023
1412de4
updating changelog
niden Jan 11, 2024
4765962
Merge pull request #16328 from zikezhang/patch-3
niden Jan 11, 2024
4425d27
#16337 - Adjust `Validation:validate()` signature
Jeckerson May 14, 2023
c03b54c
changing signature to bool
niden Jan 11, 2024
5085445
updating changelog
niden Jan 11, 2024
101fbf2
Merge pull request #16338 from phalcon/#16337-validate-signature
niden Jan 11, 2024
bbddaef
removing cache from injectable
niden Jan 13, 2024
af7ad6c
Revert "removing cache from injectable"
niden Jan 13, 2024
b59ca0b
added return types
niden Jan 18, 2024
e9f66f7
fixing toArray to ignore getters for 'source' field
niden Jan 18, 2024
d2ea714
updating changelog
niden Jan 18, 2024
96d18ec
Merge pull request #16516 from niden/T16514-find-with-source
niden Jan 18, 2024
e574032
add backer
Arhell Jan 21, 2024
d402874
resolve conflict 5.0.x
sinbadxiii Jan 29, 2024
d968fc9
Merge pull request #16520 from sinbadxiii/issue-16519
niden Jan 29, 2024
4a6f5b7
updating changelog
niden Jan 29, 2024
e51e71b
Merge pull request #16517 from phalcon/add
niden Jan 29, 2024
56c1833
Merge pull request #16521 from niden/5.0.x
niden Jan 29, 2024
f1934c5
added test to check the deprecation
niden Feb 8, 2024
a4ac94b
updating composer
niden Feb 8, 2024
3a5844b
updating changelog
niden Feb 8, 2024
51e2d32
Merge pull request #16525 from niden/T16263-deprecation-warnings
niden Feb 8, 2024
c2004bf
bumping version to 5.6.1
niden Feb 8, 2024
905d11f
regenerating ext
niden Feb 8, 2024
122c6cb
refreshing build folder
niden Feb 8, 2024
5e4d7dc
correcting date
niden Feb 8, 2024
1f2239e
Merge pull request #16526 from niden/5.0.x
niden Feb 8, 2024
53c3411
Merge branch 'master' into 5.0.x
niden Feb 8, 2024
3e4f2c6
Merge pull request #16527 from phalcon/5.0.x
niden Feb 8, 2024
19e764b
[Actions] Compile for Windows
JMoodyFWD Feb 20, 2024
7eaffa8
Fixing [Define Phalcon Module Env] to call correct directory
JMoodyFWD Feb 20, 2024
5c22ced
Fixing artifact folder typo
JMoodyFWD Feb 20, 2024
4276e78
Testing windows compile all php 8.x variants
JMoodyFWD Feb 20, 2024
b564144
Artifact Naming Cleanup
JMoodyFWD Feb 20, 2024
bf1bf32
Remove Xdebug version from artifact name
JMoodyFWD Feb 20, 2024
6f5abcd
Merge branch 'actions-windows-dll' of github.com:JMoodyFWD/cphalcon i…
JMoodyFWD Feb 20, 2024
f0ced77
Fixing Typo
JMoodyFWD Feb 20, 2024
371dea4
Cleanup Yaml labels
JMoodyFWD Feb 20, 2024
c155920
Generate Build Folder -> added to steps
JMoodyFWD Feb 20, 2024
75d146d
Retain php_phalcon.dll filename when creating artifact
JMoodyFWD Feb 20, 2024
a950bd6
Retain normal DLL name and add License.txt to Artifact
JMoodyFWD Feb 20, 2024
32cafed
Reformatting artifact name
JMoodyFWD Feb 20, 2024
ae1dd4f
Editing Artifact Name
JMoodyFWD Feb 20, 2024
56e46a5
Merge pull request #16533 from JMoodyFWD/actions-windows-dll
niden Feb 20, 2024
c816455
upgrading actions/checkout to v4
niden Feb 8, 2024
ed3dd45
fixing docblock
niden Feb 26, 2024
9595a3a
fixing upper/lower for Volt
niden Mar 13, 2024
8b60704
updating dependencies
niden Mar 13, 2024
cb6c4be
adjusting tests
niden Mar 13, 2024
ca3ba02
Merge pull request #16545 from niden/T16543-volt-upper
niden Mar 13, 2024
1562a40
bumping to 5.6.2
niden Mar 14, 2024
5fab14d
refreshing ext
niden Mar 14, 2024
057fb73
refreshing build
niden Mar 14, 2024
0e50ba3
Merge pull request #16547 from niden/5.0.x
niden Mar 14, 2024
888d2b2
Merge pull request #16548 from phalcon/5.0.x
niden Mar 14, 2024
1c2286a
remove backer
Arhell Mar 14, 2024
e37adde
Merge pull request #16550 from phalcon/remove
Jeckerson Mar 14, 2024
8ffae1b
adjusting the cli RouterInterface
niden Mar 18, 2024
c343b52
fixing docblock
niden Mar 18, 2024
ab339c8
psalm corrections
niden Mar 18, 2024
14adac6
psalm corrections
niden Mar 18, 2024
be37f80
upgrading actions
niden Mar 18, 2024
7d43389
add backer
Arhell Mar 18, 2024
8b47d55
Merge pull request #16554 from niden/T16551-cli-router
niden Mar 19, 2024
99f67dd
fix @method types
jturbide Mar 19, 2024
751e174
Merge pull request #16556 from jturbide/5.0.x
niden Mar 19, 2024
d6313a1
Merge pull request #16552 from phalcon/add
Jeckerson Mar 20, 2024
db824d5
updating changelog
niden Mar 19, 2024
d8508b3
updating composer
niden Mar 19, 2024
bf89e5a
fixed the min/max
niden Apr 3, 2024
9f46d9a
adjusted the tests and added one more
niden Apr 3, 2024
9e5e789
updating changelog
niden Apr 4, 2024
655b299
Merge pull request #16561 from niden/T16560-min-max-validator
niden Apr 4, 2024
d209f27
corrected constants; adjusted test
niden Apr 5, 2024
e66bd0c
updating changelog
niden Apr 5, 2024
b8375ad
Merge pull request #16562 from niden/T16532-column-corrections
niden Apr 5, 2024
d938357
Revert "T16532 column corrections"
niden Apr 5, 2024
44243c0
Merge pull request #16563 from phalcon/revert-16562-T16532-column-cor…
niden Apr 5, 2024
fdfc87f
Merge pull request #16564 from niden/T16532-column-corrections
niden Apr 5, 2024
9ac5dd7
enabling the mapper in the helper factory
niden Apr 29, 2024
735ce5c
updating changelog
niden Apr 29, 2024
ad6678e
Merge pull request #16574 from niden/T16571-helperfactory-mapper
niden Apr 29, 2024
7ff94ec
[#16567] - fix: changed \Phalcon\Forms\Form to set only existing prop…
noone-silent May 1, 2024
8c14b2e
[#16567] - fix: reset ini setting after test.
noone-silent May 1, 2024
e0dc3a7
Merge pull request #16575 from noone-silent/T16567-form-bind-entity-p…
niden May 1, 2024
8722b92
[#16577] - refactor: add @template for Model and add to @return in fi…
noone-silent May 2, 2024
e123c15
[#16577] - refactor: add @template for Model and add to @return in fi…
noone-silent May 3, 2024
0755759
[#16577] - refactor: add @template for Model and add to @return in fi…
noone-silent May 3, 2024
0c73a87
Merge pull request #16578 from noone-silent/T16577-enable-ide-autocom…
niden May 3, 2024
84ee128
fixing links
niden May 2, 2024
7b752ec
added tests for boolval and numbers
niden May 17, 2024
9ff268e
added conditions for numbers
niden May 17, 2024
f209030
updating changelog
niden May 17, 2024
92a111d
Merge pull request #16584 from niden/T16582-boolval-sanitize
niden May 17, 2024
e5f182f
refreshing ext
niden May 17, 2024
b4b99d6
prep for release
niden May 17, 2024
93c7690
Merge pull request #16585 from niden/5.0.x
niden May 17, 2024
4f24acc
Merge branch 'master' into 5.0.x
niden May 17, 2024
cd7c942
Bump versions of artifact actions to v4
Jeckerson May 17, 2024
465b3ff
Merge pull request #16587 from phalcon/bump-actions-v4
Jeckerson May 17, 2024
5cc8649
Bump versions of artifact actions to v4
Jeckerson May 17, 2024
989700b
Update main.yml
niden May 17, 2024
041897a
Merge pull request #16588 from phalcon/niden-patch-1
niden May 17, 2024
6cedc11
Update main.yml
niden May 17, 2024
03653b4
Merge pull request #16586 from phalcon/5.0.x
niden May 17, 2024
2b730be
[#16591] - fix: correct the \Serializable implementation.
noone-silent May 21, 2024
73321dc
[#16591] - chore: added missing changelog changes
noone-silent May 21, 2024
329c2dd
Merge pull request #16592 from noone-silent/T16591-fix-wrong-serializ…
niden May 21, 2024
8b208bd
corrected constants; adjusted test
niden Apr 5, 2024
35a8c30
Merge pull request #16595 from niden/5.0.x
niden May 21, 2024
afd403d
updating version that I forgot
niden May 22, 2024
8d91b54
correcting version that I forgot
niden May 22, 2024
32630bd
[#16593] - fix: fixed memory leak by anonymous function in PascalCase…
noone-silent May 24, 2024
34be74c
Merge branch '5.0.x' into T16593-fix-memory-leak-by-anonymous-function
niden May 24, 2024
5c3d3fa
Merge pull request #16598 from noone-silent/T16593-fix-memory-leak-by…
niden May 24, 2024
bee6429
[#16593] - fix: fixed memory leak by anonymous function in PascalCase…
noone-silent May 24, 2024
5cf6af2
correcting interface for getHostname
niden May 31, 2024
b1dbf3e
removing docker version
niden Jun 1, 2024
117edea
updating changelog
niden Jun 1, 2024
ba0c1af
Merge pull request #16602 from niden/T16601-gethostname
niden Jun 2, 2024
ba37efd
Bump `ZEPHIR_PARSER_VERSION` to `1.6.1`
Jeckerson Jun 4, 2024
fbd561c
Update 'phalcon/zephir' package
Jeckerson Jun 4, 2024
261725b
Remove unused 14__closure
Jeckerson Jun 4, 2024
d5976e4
Regenerate ext/ directory
Jeckerson Jun 4, 2024
994d0f9
Regenerate build/phalcon/ directory
Jeckerson Jun 4, 2024
096f611
Enable MacOS in matrix
Jeckerson Jun 4, 2024
d371084
Merge pull request #16605 from phalcon/fix-ci
Jeckerson Jun 5, 2024
b24c728
bumping ilammy/msvc-dev-cmd action version
niden Jun 3, 2024
5860d59
updating composer
niden Jun 3, 2024
9556898
aligning interface parameter names
niden Jun 3, 2024
eb4b30f
more interface parameters corrections
niden Jun 3, 2024
3c2d147
[#16606] - feat: added events and events manager to storage and cache…
noone-silent Jun 7, 2024
566c600
[#16606] - fix: added missing EventsAwareInterface
noone-silent Jun 7, 2024
fb51b02
changed compileSource to also return array
niden Jun 7, 2024
4cc3237
updated changelog
niden Jun 7, 2024
8827949
Merge pull request #16609 from niden/T16608-compiler-compilesource
niden Jun 7, 2024
09a6657
[#16606] - refactor: changed fire method to request key/keys.
noone-silent Jun 8, 2024
fbb8318
Merge pull request #16607 from noone-silent/T16606-add-events-to-stor…
niden Jun 8, 2024
d351f38
[#16604] - fix: correctly handle transaction rollbacks if exceptions …
noone-silent Jun 10, 2024
f8af0bc
[#16604] - fix: fixed cs error and psalm warning.
noone-silent Jun 10, 2024
498e6fb
[#16604] - Merge branch 'refs/heads/5.0.x' into T16604-catch-exceptio…
noone-silent Jun 10, 2024
8cfc6b7
Merge pull request #16610 from noone-silent/T16604-catch-exception-ro…
niden Jun 16, 2024
3c07c6c
bumping version
niden Jul 9, 2024
4cbe5a2
refreshing build and ext
niden Jul 9, 2024
c4a088f
composer update
niden Jul 9, 2024
29ce418
Merge pull request #16622 from phalcon/v5.8.0-prep
niden Jul 9, 2024
14b0f1c
Merge pull request #16623 from phalcon/5.0.x
niden Jul 9, 2024
08c43d7
update backers
Arhell Aug 1, 2024
c6539d7
Merge pull request #16631 from phalcon/bak
Jeckerson Aug 1, 2024
3d7c38a
corrected property reference in Injectable
niden Aug 13, 2024
3ed442b
corrected namespaces for tests
niden Aug 13, 2024
8d02e38
updating composer
niden Aug 13, 2024
6690b4c
updating composer for php 8.0
niden Aug 13, 2024
8134bba
updated changelog
niden Aug 13, 2024
83677f1
Merge pull request #16635 from niden-code/T16634-docblock-reference
niden Aug 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
phalcon#16477 - Mass rename parameters to match ParamNameMismatch P…
…salm rule
  • Loading branch information
Jeckerson committed Dec 23, 2023
commit 647e49145136386f5ab7df2b6a69237d61b97e00
4 changes: 2 additions & 2 deletions phalcon/Di/Di.zep
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,9 @@ class Di implements DiInterface
* $di["request"] = new \Phalcon\Http\Request();
*```
*/
public function offsetSet(mixed name, mixed definition) -> void
public function offsetSet(mixed offset, mixed value) -> void
{
this->setShared(name, definition);
this->setShared(offset, value);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions phalcon/Messages/Messages.zep
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,13 @@ class Messages implements ArrayAccess, Countable, Iterator, JsonSerializable
*
* @param \Phalcon\Messages\Message message
*/
public function offsetSet(mixed index, mixed message) -> void
public function offsetSet(mixed offset, mixed value) -> void
{
if typeof message != "object" {
if typeof value !== "object" {
throw new Exception("The message must be an object");
}

let this->messages[index] = message;
let this->messages[offset] = value;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions phalcon/Mvc/Model/Resultset.zep
Original file line number Diff line number Diff line change
Expand Up @@ -517,10 +517,10 @@ abstract class Resultset
/**
* Resultsets cannot be changed. It has only been implemented to meet the definition of the ArrayAccess interface
*
* @param int index
* @param int offset
* @param \Phalcon\Mvc\ModelInterface value
*/
public function offsetSet(var index, var value) -> void
public function offsetSet(var offset, var value) -> void
{
throw new Exception("Cursor is an immutable ArrayAccess object");
}
Expand Down
4 changes: 2 additions & 2 deletions phalcon/Mvc/Model/Row.zep
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ class Row extends \stdClass implements EntityInterface, ResultInterface, ArrayAc
/**
* Rows cannot be changed. It has only been implemented to meet the definition of the ArrayAccess interface
*
* @param string|int index
* @param string|int offsetSet
* @param ModelInterface value
*/
public function offsetSet(mixed index, mixed value) -> void
public function offsetSet(mixed offset, mixed value) -> void
{
throw new Exception("Row is an immutable ArrayAccess object");
}
Expand Down
6 changes: 3 additions & 3 deletions phalcon/Session/Adapter/AbstractAdapter.zep
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ abstract class AbstractAdapter implements SessionHandlerInterface
/**
* Open
*/
public function open(var savePath, var sessionName) -> bool
public function open(var path, var name) -> bool
{
return true;
}

/**
* Write
*/
public function write(var sessionId, var data) -> bool
public function write(var id, var data) -> bool
{
return this->adapter->set(sessionId, data);
return this->adapter->set(id, data);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions phalcon/Session/Adapter/Noop.zep
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ class Noop implements SessionHandlerInterface
/**
* Open
*/
public function open(var savePath, var sessionName) -> bool
public function open(var path, var name) -> bool
{
return true;
}

/**
* Write
*/
public function write(var sessionId, var data) -> bool
public function write(var id, var data) -> bool
{
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions phalcon/Session/Adapter/Stream.zep
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class Stream extends Noop
*
* @return bool
*/
public function open(var savePath, var sessionName) -> bool
public function open(var path, var name) -> bool
{
return true;
}
Expand Down Expand Up @@ -148,11 +148,11 @@ class Stream extends Noop
return data;
}

public function write(var sessionId, var data) -> bool
public function write(var id, var data) -> bool
{
var name;

let name = this->path . this->getPrefixedName(sessionId);
let name = this->path . this->getPrefixedName(id);

return false !== this->phpFilePutContents(name, data, LOCK_EX);
}
Expand Down
6 changes: 3 additions & 3 deletions phalcon/Support/Collection.zep
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,11 @@ class Collection implements
* Offset to set
* See [offsetSet](https://php.net/manual/en/arrayaccess.offsetset.php)
*/
public function offsetSet(mixed element, mixed value) -> void
public function offsetSet(mixed offset, mixed value) -> void
{
let element = (string) element;
let offset = (string) offset;

this->set(element, value);
this->set(offset, value);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions phalcon/Support/Registry.zep
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ final class Registry extends Collection
*
* @link https://php.net/manual/en/arrayaccess.offsetset.php
*/
final public function offsetSet(var element, var value) -> void
final public function offsetSet(var offset, var value) -> void
{
parent::set(element, value);
parent::set(offset, value);
}

/**
Expand Down
4 changes: 0 additions & 4 deletions phalcon/Translate/Adapter/Csv.zep
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ use Phalcon\Translate\Exception;
use Phalcon\Translate\InterpolatorFactory;

/**
* Class Csv
*
* @package Phalcon\Translate\Adapter
*
* @property array $translate
*/
class Csv extends AbstractAdapter implements ArrayAccess
Expand Down