Skip to content

Commit 3cd7431

Browse files
alexdrydenalexdryden
committed
Run csfixer
1 parent b2acdc5 commit 3cd7431

File tree

81 files changed

+459
-851
lines changed

Some content is hidden

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

81 files changed

+459
-851
lines changed

‎config/module.config.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -284,16 +284,6 @@
284284
]
285285
]
286286
],
287-
'change' => [
288-
'type' => Literal::class,
289-
'options' => [
290-
'route' => '/change',
291-
'defaults' => [
292-
'controller' => 'ChangeTeam',
293-
'action' => 'change'
294-
]
295-
]
296-
],
297287
'all' => [
298288
'type' => Literal::class,
299289
'options' => [

‎src/Api/Adapter/TeamAdapter.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ public function getEntityClass()
3838
return Team::class;
3939
}
4040

41-
public function hydrate(Request $request, EntityInterface $entity,
41+
public function hydrate(
42+
Request $request,
43+
EntityInterface $entity,
4244
ErrorStore $errorStore
4345
) {
4446
if ($this->shouldHydrate($request, 'o:name')) {
@@ -117,7 +119,7 @@ public function hydrate(Request $request, EntityInterface $entity,
117119
// return $result;
118120
// }
119121

120-
///3 ifs permit single return via specified column
122+
///3 ifs permit single return via specified column
121123
public function buildQuery(QueryBuilder $qb, array $query)
122124
{
123125
if (isset($query['id'])) {
@@ -252,7 +254,7 @@ public function sortQuery(QueryBuilder $qb, array $query)
252254
break;
253255
case 'team':
254256
$query['sort_by'] = 'name';
255-
// No break.
257+
// no break.
256258
default:
257259
parent::sortQuery($qb, $query);
258260
break;
@@ -340,5 +342,4 @@ public function validateRequest(Request $request, ErrorStore $errorStore)
340342
$result = $this->validateName($data['o:name'], $errorStore);
341343
}
342344
}
343-
344345
}

‎src/Api/Adapter/TeamResourceAdapter.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace Teams\Api\Adapter;
55

6-
76
use Doctrine\ORM\QueryBuilder;
87
use Omeka\Api\Adapter\AbstractEntityAdapter;
98
use Omeka\Api\Request;
@@ -36,8 +35,10 @@ public function getEntityClass()
3635
return TeamResource::class;
3736
}
3837

39-
public function hydrate(Request $request, EntityInterface $entity,
40-
ErrorStore $errorStore
38+
public function hydrate(
39+
Request $request,
40+
EntityInterface $entity,
41+
ErrorStore $errorStore
4142
) {
4243
if ($this->shouldHydrate($request, 'team')) {
4344
$name = $request->getValue('team');
@@ -115,7 +116,7 @@ public function hydrate(Request $request, EntityInterface $entity,
115116
// return $result;
116117
// }
117118

118-
///3 ifs permit single return via specified column
119+
///3 ifs permit single return via specified column
119120
public function buildQuery(QueryBuilder $qb, array $query)
120121
{
121122
if (isset($query['id'])) {
@@ -254,6 +255,4 @@ public function buildQuery(QueryBuilder $qb, array $query)
254255
// }
255256
// }
256257
// }
257-
258-
259-
}
258+
}

‎src/Api/Adapter/TeamRoleAdapter.php‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ public function getEntityClass()
4545
return TeamRole::class;
4646
}
4747

48-
public function hydrate(Request $request, EntityInterface $entity,
49-
ErrorStore $errorStore
48+
public function hydrate(
49+
Request $request,
50+
EntityInterface $entity,
51+
ErrorStore $errorStore
5052
) {
5153
if ($this->shouldHydrate($request, 'o:name')) {
5254
$value = $request->getValue('o:name');
@@ -66,36 +68,31 @@ public function hydrate(Request $request, EntityInterface $entity,
6668
if ($this->shouldHydrate($request, 'can_add_items')) {
6769
$value = $request->getValue('can_add_items');
6870
if (!is_null($value)) {
69-
if($value == 1 || 0){
71+
if ($value == 1 || 0) {
7072
$entity->setCanAddItems($value);
71-
}else{
73+
} else {
7274
$entity->setCanAddItems(null);
7375
}
74-
75-
7676
}
77-
7877
}
7978

8079
if ($this->shouldHydrate($request, 'can_add_users')) {
8180
$value = $request->getValue('can_add_users');
8281
if (!is_null($value)) {
83-
84-
if($value == 1 || 0){
82+
if ($value == 1 || 0) {
8583
$entity->setCanAddUsers($value);
86-
}else{
84+
} else {
8785
$entity->setCanAddUsers(null);
8886
}
89-
9087
}
9188
}
9289

9390
if ($this->shouldHydrate($request, 'can_add_itemsets')) {
9491
$value = $request->getValue('can_add_itemsets');
9592
if (!is_null($value)) {
96-
if($value == 1 || 0){
93+
if ($value == 1 || 0) {
9794
$entity->setCanAddItemsets($value);
98-
}else{
95+
} else {
9996
$entity->setCanAddItemsets(null);
10097
}
10198
}
@@ -104,9 +101,9 @@ public function hydrate(Request $request, EntityInterface $entity,
104101
if ($this->shouldHydrate($request, 'can_modify_resources')) {
105102
$value = $request->getValue('can_modify_resources');
106103
if (!is_null($value)) {
107-
if($value == 1 || 0){
104+
if ($value == 1 || 0) {
108105
$entity->setCanModifyResources($value);
109-
}else{
106+
} else {
110107
$entity->setCanModifyResources(null);
111108
}
112109
}
@@ -115,9 +112,9 @@ public function hydrate(Request $request, EntityInterface $entity,
115112
if ($this->shouldHydrate($request, 'can_delete_resources')) {
116113
$value = $request->getValue('can_delete_resources');
117114
if (!is_null($value)) {
118-
if($value == 1 || 0){
115+
if ($value == 1 || 0) {
119116
$entity->setCanDeleteResources($value);
120-
}else{
117+
} else {
121118
$entity->setCanDeleteResources(null);
122119
}
123120
}
@@ -127,9 +124,9 @@ public function hydrate(Request $request, EntityInterface $entity,
127124
if ($this->shouldHydrate($request, 'can_add_site_pages')) {
128125
$value = $request->getValue('can_add_site_pages');
129126
if (!is_null($value)) {
130-
if($value == 1 || 0){
127+
if ($value == 1 || 0) {
131128
$entity->setCanAddSitePages($value);
132-
}else{
129+
} else {
133130
$entity->setCanAddSitePages(null);
134131
}
135132
}
@@ -138,7 +135,7 @@ public function hydrate(Request $request, EntityInterface $entity,
138135

139136

140137

141-
/////3 ifs permit single return via specified column
138+
/////3 ifs permit single return via specified column
142139
// public function buildQuery(QueryBuilder $qb, array $query)
143140
// {
144141
// if (isset($query['id'])) {

‎src/Api/Adapter/TeamUserAdapter.php‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class TeamUserAdapter extends AbstractEntityAdapter
1515
{
1616
use QueryBuilderTrait;
1717

18-
protected $sortFields = [
18+
protected $sortFields = [
1919
'id' => 'team'.'user',
2020
'team' => 'team',
2121
'user' => 'user',
@@ -38,8 +38,10 @@ public function getEntityClass()
3838
return TeamUser::class;
3939
}
4040

41-
public function hydrate(Request $request, EntityInterface $entity,
42-
ErrorStore $errorStore
41+
public function hydrate(
42+
Request $request,
43+
EntityInterface $entity,
44+
ErrorStore $errorStore
4345
) {
4446
if ($this->shouldHydrate($request, 'o:team')) {
4547
$team_id = $request->getValue('o:team');
@@ -70,52 +72,54 @@ public function hydrate(Request $request, EntityInterface $entity,
7072
$entity->setCurrent($current);
7173
}
7274
}
73-
7475
}
7576

7677

7778

7879
public function buildQuery(QueryBuilder $qb, array $query)
7980
{
8081
if (isset($query['id'])) {
81-
$qb->andWhere($qb->expr()->eq(
82+
$qb->andWhere(
83+
$qb->expr()->eq(
8284
"Teams\Entity\TeamUser.id",
83-
$this->createNamedParameter($qb, $query['id']))
85+
$this->createNamedParameter($qb, $query['id'])
86+
)
8487
);
8588
}
8689

8790
if (isset($query['team_id'])) {
88-
$qb->andWhere($qb->expr()->eq(
91+
$qb->andWhere(
92+
$qb->expr()->eq(
8993
"Teams\Entity\TeamUser.team",
90-
$this->createNamedParameter($qb, $query['team_id']))
91-
); }
94+
$this->createNamedParameter($qb, $query['team_id'])
95+
)
96+
);
97+
}
9298

9399
if (isset($query['user_id'])) {
94-
$qb->andWhere($qb->expr()->eq(
100+
$qb->andWhere(
101+
$qb->expr()->eq(
95102
"Teams\Entity\TeamUser.user",
96-
$this->createNamedParameter($qb, $query['user_id']))
97-
); }
103+
$this->createNamedParameter($qb, $query['user_id'])
104+
)
105+
);
106+
}
98107
if (isset($query['role'])) {
99-
$qb->andWhere($qb->expr()->eq(
108+
$qb->andWhere(
109+
$qb->expr()->eq(
100110
"Teams\Entity\TeamUser.role",
101-
$this->createNamedParameter($qb, $query['role']))
111+
$this->createNamedParameter($qb, $query['role'])
112+
)
102113
);
103114
}
104115

105116
if (isset($query['current'])) {
106-
$qb->andWhere($qb->expr()->eq(
117+
$qb->andWhere(
118+
$qb->expr()->eq(
107119
"Teams\Entity\TeamUser.is_current",
108-
$this->createNamedParameter($qb, $query['is_current']))
120+
$this->createNamedParameter($qb, $query['is_current'])
121+
)
109122
);
110123
}
111-
112-
113124
}
114-
115-
116-
117-
118-
119-
120-
121125
}

‎src/Api/Representation/TeamResourceRepresentation.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace Teams\Api\Representation;
55

6-
76
use Omeka\Api\Representation\AbstractEntityRepresentation;
87

98
//legacy from deciding how much of the module to expose to the API
@@ -109,6 +108,4 @@ public function resource()
109108
// );
110109
// }
111110
//
112-
113-
114-
}
111+
}

0 commit comments

Comments
 (0)