@@ -204,15 +204,22 @@ static void test_php_package_priority(void) {
204
204
nr_php_package_t * p ;
205
205
nr_php_packages_t * hm = NULL ;
206
206
int count ;
207
- char * legacy_versions [] = {
208
- NO_VERSION , PACKAGE_VERSION };
207
+ char * legacy_versions [] = {NO_VERSION , PACKAGE_VERSION };
209
208
210
209
// Package added with legacy priority first - version from composer should win
211
- for (size_t i = 0 ; i < sizeof (legacy_versions )/sizeof (legacy_versions [0 ]); i ++ ) {
212
- legacy_package = nr_php_package_create (PACKAGE_NAME , legacy_versions [i ]); // legacy priority
213
- tlib_pass_if_int_equal ("create package by uses legacy priority" , NR_PHP_PACKAGE_SOURCE_LEGACY , legacy_package -> source_priority );
214
- composer_package = nr_php_package_create_with_source (PACKAGE_NAME , COMPOSER_VERSION , NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
215
- tlib_pass_if_int_equal ("create package by uses composer priority" , NR_PHP_PACKAGE_SOURCE_COMPOSER , composer_package -> source_priority );
210
+ for (size_t i = 0 ; i < sizeof (legacy_versions ) / sizeof (legacy_versions [0 ]);
211
+ i ++ ) {
212
+ legacy_package = nr_php_package_create (
213
+ PACKAGE_NAME , legacy_versions [i ]); // legacy priority
214
+ tlib_pass_if_int_equal ("create package by uses legacy priority" ,
215
+ NR_PHP_PACKAGE_SOURCE_LEGACY ,
216
+ legacy_package -> source_priority );
217
+ composer_package = nr_php_package_create_with_source (
218
+ PACKAGE_NAME , COMPOSER_VERSION ,
219
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
220
+ tlib_pass_if_int_equal ("create package by uses composer priority" ,
221
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ,
222
+ composer_package -> source_priority );
216
223
217
224
hm = nr_php_packages_create ();
218
225
// order of adding packages: legacy first, composer second
@@ -224,17 +231,27 @@ static void test_php_package_priority(void) {
224
231
225
232
p = nr_php_packages_get_package (hm , PACKAGE_NAME );
226
233
tlib_pass_if_not_null ("package exists" , p );
227
- tlib_pass_if_str_equal ("package version from composer wins" , COMPOSER_VERSION , p -> package_version );
234
+ tlib_pass_if_str_equal ("package version from composer wins" ,
235
+ COMPOSER_VERSION , p -> package_version );
228
236
229
237
nr_php_packages_destroy (& hm );
230
238
}
231
239
232
- // Package added with composer priority first - version from composer should win
233
- for (size_t i = 0 ; i < sizeof (legacy_versions )/sizeof (legacy_versions [0 ]); i ++ ) {
234
- legacy_package = nr_php_package_create (PACKAGE_NAME , legacy_versions [i ]); // legacy priority
235
- tlib_pass_if_int_equal ("create package by uses legacy priority" , NR_PHP_PACKAGE_SOURCE_LEGACY , legacy_package -> source_priority );
236
- composer_package = nr_php_package_create_with_source (PACKAGE_NAME , COMPOSER_VERSION , NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
237
- tlib_pass_if_int_equal ("create package by uses composer priority" , NR_PHP_PACKAGE_SOURCE_COMPOSER , composer_package -> source_priority );
240
+ // Package added with composer priority first - version from composer should
241
+ // win
242
+ for (size_t i = 0 ; i < sizeof (legacy_versions ) / sizeof (legacy_versions [0 ]);
243
+ i ++ ) {
244
+ legacy_package = nr_php_package_create (
245
+ PACKAGE_NAME , legacy_versions [i ]); // legacy priority
246
+ tlib_pass_if_int_equal ("create package by uses legacy priority" ,
247
+ NR_PHP_PACKAGE_SOURCE_LEGACY ,
248
+ legacy_package -> source_priority );
249
+ composer_package = nr_php_package_create_with_source (
250
+ PACKAGE_NAME , COMPOSER_VERSION ,
251
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
252
+ tlib_pass_if_int_equal ("create package by uses composer priority" ,
253
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ,
254
+ composer_package -> source_priority );
238
255
239
256
hm = nr_php_packages_create ();
240
257
// order of adding packages: legacy first, composer second
@@ -246,17 +263,27 @@ static void test_php_package_priority(void) {
246
263
247
264
p = nr_php_packages_get_package (hm , PACKAGE_NAME );
248
265
tlib_pass_if_not_null ("package exists" , p );
249
- tlib_pass_if_str_equal ("package version from composer wins" , COMPOSER_VERSION , p -> package_version );
266
+ tlib_pass_if_str_equal ("package version from composer wins" ,
267
+ COMPOSER_VERSION , p -> package_version );
250
268
251
269
nr_php_packages_destroy (& hm );
252
270
}
253
271
254
- // Package added with composer priority only - last version from composer should win
255
- composer_package = nr_php_package_create_with_source (PACKAGE_NAME , COMPOSER_VERSION , NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
256
- tlib_pass_if_int_equal ("create package by uses composer priority" , NR_PHP_PACKAGE_SOURCE_COMPOSER , composer_package -> source_priority );
257
-
258
- composer_package_2 = nr_php_package_create_with_source (PACKAGE_NAME , COMPOSER_VERSION_2 , NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
259
- tlib_pass_if_int_equal ("create package by uses composer priority" , NR_PHP_PACKAGE_SOURCE_COMPOSER , composer_package_2 -> source_priority );
272
+ // Package added with composer priority only - last version from composer
273
+ // should win
274
+ composer_package = nr_php_package_create_with_source (
275
+ PACKAGE_NAME , COMPOSER_VERSION ,
276
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
277
+ tlib_pass_if_int_equal ("create package by uses composer priority" ,
278
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ,
279
+ composer_package -> source_priority );
280
+
281
+ composer_package_2 = nr_php_package_create_with_source (
282
+ PACKAGE_NAME , COMPOSER_VERSION_2 ,
283
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ); // composer priority
284
+ tlib_pass_if_int_equal ("create package by uses composer priority" ,
285
+ NR_PHP_PACKAGE_SOURCE_COMPOSER ,
286
+ composer_package_2 -> source_priority );
260
287
261
288
hm = nr_php_packages_create ();
262
289
// order of adding packages: composer first, composer second
@@ -268,7 +295,8 @@ static void test_php_package_priority(void) {
268
295
269
296
p = nr_php_packages_get_package (hm , PACKAGE_NAME );
270
297
tlib_pass_if_not_null ("package exists" , p );
271
- tlib_pass_if_str_equal ("package version from last composer wins" , COMPOSER_VERSION_2 , p -> package_version );
298
+ tlib_pass_if_str_equal ("package version from last composer wins" ,
299
+ COMPOSER_VERSION_2 , p -> package_version );
272
300
273
301
nr_php_packages_destroy (& hm );
274
302
}
0 commit comments