8000 Merge branch '2.7' · jderusse/symfony@93247a8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 93247a8

Browse files
fabpotfabpot
committed
Merge branch '2.7'
* 2.7: (65 commits) Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container [FrameworkBundle][Router Cmd] use debug namespace. [FrameworkBundle] Update deprecated service call Fix PHP Fatal error: Cannot call constructor in symfony/console/Symfony/Component/Console/Helper/DialogHelper.php on line 37 Removed a dev annotation from a version constraint Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes Append to PR symfony#12737 referring Ticket symfony#12704 Issue symfony#12658 Add a deprecation note about Translator's setFallbackLocale... Issue symfony#12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration... Hackday deprecated 12621 Added deprecation log for validate and validateValue on ExecutionContext... [Console] [Hackday] [2.7] Add a deprecation note about ProgressHelper [Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method [Validator] Added a deprecation note about setPropertyAccessor symfony#12698 [Locale] Adding a deprecation note about the Locale component ...
2 parents 04ec82e + 172ac96 commit 93247a8

22 files changed

+180
-116
lines changed

‎Dbal/AclProvider.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function findAcls(array $oids, array $sids = array())
104104
$currentBatch = array();
105105
$oidLookup = array();
106106

107-
for ($i = 0,$c = count($oids); $i<$c; $i++) {
107+
for ($i = 0, $c = count($oids); $i<$c; $i++) {
108108
$oid = $oids[$i];
109109
$oidLookupKey = $oid->getIdentifier().$oid->getType();
110110
$oidLookup[$oidLookupKey] = $oid;
@@ -224,6 +224,7 @@ public function findAcls(array $oids, array $sids = array())
224224
* ACEs, and security identities.
225225
*
226226
* @param array $ancestorIds
227+
*
227228
* @return string
228229
*/
229230
protected function getLookupSql(array $ancestorIds)
@@ -330,6 +331,7 @@ protected function getAncestorLookupSql(array $batch)
330331
*
331332
* @param ObjectIdentityInterface $oid
332333
* @param bool $directChildrenOnly
334+
*
333335
* @return string
334336
*/
335337
protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChildrenOnly)
@@ -361,6 +363,7 @@ protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChild
361363
* identity.
362364
*
363365
* @param ObjectIdentityInterface $oid
366+
*
364367
* @return string
365368
*/
366369
protected function getSelectObjectIdentityIdSql(ObjectIdentityInterface $oid)
@@ -385,6 +388,7 @@ protected function getSelectObjectIdentityIdSql(ObjectIdentityInterface $oid)
385388
* Returns the primary key of the passed object identity.
386389
*
387390
* @param ObjectIdentityInterface $oid
391+
*
388392
* @return int
389393
*/
390394
final protected function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid)
@@ -493,8 +497,10 @@ private function lookupObjectIdentities(array $batch, array $sids, array $oidLoo
493497
* @param Statement $stmt
494498
* @param array $oidLookup
495499
* @param array $sids
496-
* @throws \RuntimeException
500+
*
497501
* @return \SplObjectStorage
502+
*
503+
* @throws \RuntimeException
498504
*/
499505
private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, array $sids)
500506
{

‎Dbal/MutableAclProvider.php

Lines changed: 53 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,8 @@ public function updateUserSecurityIdentity(UserSecurityIdentity $usid, $oldUsern
378378
/**
379379
* Constructs the SQL for deleting access control entries.
380380
*
381-
* @param int $oidPK
381+
* @param int $oidPK
382+
*
382383
* @return string
383384
*/
384385
protected function getDeleteAccessControlEntriesSql($oidPK)
@@ -393,7 +394,8 @@ protected function getDeleteAccessControlEntriesSql($oidPK)
393394
/**
394395
* Constructs the SQL for deleting a specific ACE.
395396
*
396-
* @param int $acePK
397+
* @param int $acePK
398+
*
397399
* @return string
398400
*/
399401
protected function getDeleteAccessControlEntrySql($acePK)
@@ -408,7 +410,8 @@ protected function getDeleteAccessControlEntrySql($acePK)
408410
/**
409411
* Constructs the SQL for deleting an object identity.
410412
*
411-
* @param int $pk
413+
* @param int $pk
414+
*
412415
* @return string
413416
*/
414417
protected function getDeleteObjectIdentitySql($pk)
@@ -423,7 +426,8 @@ protected function getDeleteObjectIdentitySql($pk)
423426
/**
424427
* Constructs the SQL for deleting relation entries.
425428
*
426-
* @param int $pk
429+
* @param int $pk
430+
*
427431
* @return string
428432
*/
429433
protected function getDeleteObjectIdentityRelationsSql($pk)
@@ -438,16 +442,17 @@ protected function getDeleteObjectIdentityRelationsSql($pk)
438442
/**
439443
* Constructs the SQL for inserting an ACE.
440444
*
441-
* @param int $classId
442-
* @param int|null $objectIdentityId
443-
* @param string|null $field
444-
* @param int $aceOrder
445-
* @param int $securityIdentityId
446-
* @param string $strategy
447-
* @param int $mask
448-
* @param bool $granting
449-
* @param bool $auditSuccess
450-
* @param bool $auditFailure
445+
* @param int $classId
446+
* @param int|null $objectIdentityId
447+
* @param string|null $field
448+
* @param int $aceOrder
449+
* @param int $securityIdentityId
450+
* @param string $strategy
451+
* @param int $mask
452+
* @param bool $granting
453+
* @param bool $auditSuccess
454+
* @param bool $auditFailure
455+
*
451456
* @return string
452457
*/
453458
protected function getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $securityIdentityId, $strategy, $mask, $granting, $auditSuccess, $auditFailure)
@@ -488,6 +493,7 @@ class_id,
488493
* Constructs the SQL for ins 10000 erting a new class type.
489494
*
490495
* @param string $classType
496+
*
491497
* @return string
492498
*/
493499
protected function getInsertClassSql($classType)
@@ -502,8 +508,9 @@ protected function getInsertClassSql($classType)
502508
/**
503509
* Constructs the SQL for inserting a relation entry.
504510
*
505-
* @param int $objectIdentityId
506-
* @param int $ancestorId
511+
* @param int $objectIdentityId
512+
* @param int $ancestorId
513+
*
507514
* @return string
508515
*/
509516
protected function getInsertObjectIdentityRelationSql($objectIdentityId, $ancestorId)
@@ -519,9 +526,10 @@ protected function getInsertObjectIdentityRelationSql($objectIdentityId, $ancest
519526
/**
520527
* Constructs the SQL for inserting an object identity.
521528
*
522-
* @param string $identifier
523-
* @param int $classId
524-
* @param bool $entriesInheriting
529+
* @param string $identifier
530+
* @param int $classId
531+
* @param bool $entriesInheriting
532+
*
525533
* @return string
526534
*/
527535
protected function getInsertObjectIdentitySql($identifier, $classId, $entriesInheriting)
@@ -544,7 +552,9 @@ protected function getInsertObjectIdentitySql($identifier, $classId, $entriesInh
544552
* Constructs the SQL for inserting a security identity.
545553
*
546554
* @param SecurityIdentityInterface $sid
555+
*
547556
* @throws \InvalidArgumentException
557+
*
548558
* @return string
549559
*/
550560
protected function getInsertSecurityIdentitySql(SecurityIdentityInterface $sid)
@@ -570,10 +580,11 @@ protected function getInsertSecurityIdentitySql(SecurityIdentityInterface $sid)
570580
/**
571581
* Constructs the SQL for selecting an ACE.
572582
*
573-
* @param int $classId
574-
* @param int $oid
575-
* @param string $field
576-
* @param int $order
583+
* @param int $classId
584+
* @param int $oid
585+
* @param string $field
586+
* @param int $order
587+
*
577588
* @return string
578589
*/
579590
protected function getSelectAccessControlEntryIdSql($classId, $oid, $field, $order)
@@ -597,6 +608,7 @@ protected function getSelectAccessControlEntryIdSql($classId, $oid, $field, $ord
597608
* the passed class type.
598609
*
599610
* @param string $classType
611+
*
600612
* @return string
601613
*/
602614
protected function getSelectClassIdSql($classType)
@@ -612,7 +624,9 @@ protected function getSelectClassIdSql($classType)
612624
* Constructs the SQL for selecting the primary key of a security identity.
613625
*
614626
* @param SecurityIdentityInterface $sid
627+
*
615628
* @throws \InvalidArgumentException
629+
*
616630
* @return string
617631
*/
618632
protected function getSelectSecurityIdentityIdSql(SecurityIdentityInterface $sid)
@@ -653,9 +667,11 @@ protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid
653667
/**
654668
* Constructs the SQL for updating an object identity.
655669
*
656-
* @param int $pk
657-
* @param array $changes
670+
* @param int $pk
671+
* @param array $changes
672+
*
658673
* @throws \InvalidArgumentException
674+
*
659675
* @return string
660676
*/
661677
protected function getUpdateObjectIdentitySql($pk, array $changes)
@@ -700,9 +716,11 @@ protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid,
700716
/**
701717
* Constructs the SQL for updating an ACE.
702718
*
703-
* @param int $pk
704-
* @param array $sets
719+
* @param int $pk
720+
* @param array $sets
721+
*
705722
* @throws \InvalidArgumentException
723+
*
706724
* @return string
707725
*/
708726
protected function getUpdateAccessControlEntrySql($pk, array $sets)
@@ -737,6 +755,7 @@ private function createObjectIdentity(ObjectIdentityInterface $oid)
737755
* If the type does not yet exist in the database, it will be created.
738756
*
739757
* @param string $classType
758+
*
740759
* @return int
741760
*/
742761
private function createOrRetrieveClassId($classType)
@@ -757,6 +776,7 @@ private function createOrRetrieveClassId($classType)
757776
* created.
758777
*
759778
* @param SecurityIdentityInterface $sid
779+
*
760780
* @return int
761781
*/
762782
private function createOrRetrieveSecurityIdentityId(SecurityIdentityInterface $sid)
@@ -773,7 +793,7 @@ private function createOrRetrieveSecurityIdentityId(SecurityIdentityInterface $s
773793
/**
774794
* Deletes all ACEs for the given object identity primary key.
775795
*
776-
* @param int $oidPK
796+
* @param int $oidPK
777797
*/
778798
private function deleteAccessControlEntries($oidPK)
779799
{
@@ -783,7 +803,7 @@ private function deleteAccessControlEntries($oidPK)
783803
/**
784804
* Deletes the object identity from the database.
785805
*
786-
* @param int $pk
806+
* @param int $pk
787807
*/
788808
private function deleteObjectIdentity($pk)
789809
{
@@ -793,7 +813,7 @@ private function deleteObjectIdentity($pk)
793813
/**
794814
* Deletes all entries from the relations table from the database.
795815
*
796-
* @param int $pk
816+
* @param int $pk
797817
*/
798818
private function deleteObjectIdentityRelations($pk)
799819
{
@@ -831,7 +851,7 @@ private function updateNewFieldAceProperty($name, array $changes)
831851
$classIds = new \SplObjectStorage();
832852
$currentIds = array();
833853
foreach ($changes[1] as $field => $new) {
834-
for ($i = 0,$c = count($new); $i<$c; $i++) {
854+
for ($i = 0, $c = count($new); $i<$c; $i++) {
835855
$ace = $new[$i];
836856

837857
if (null === $ace->getId()) {
@@ -908,7 +928,7 @@ private function updateNewAceProperty($name, array $changes)
908928
$sids = new \SplObjectStorage();
909929
$classIds = new \SplObjectStorage();
910930
$currentIds = array();
911-
for ($i = 0,$c = count($new); $i<$c; $i++) {
931+
for ($i = 0, $c = count($new); $i<$c; $i++) {
912932
$ace = $new[$i];
913933

914934
if (null === $ace->getId()) {
@@ -951,7 +971,7 @@ private function updateOldAceProperty($name, array $changes)
951971
list($old, $new) = $changes;
952972
$currentIds = array();
953973

954-
for ($i = 0,$c = count($new); $i<$c; $i++) {
974+
for ($i = 0, $c = count($new); $i<$c; $i++) {
955975
$ace = $new[$i];
956976

957977
if (null !== $ace->getId()) {

0 commit comments

Comments
 (0)
0