rename [MASConstraintMaker initWithView:item:] to [MASConstraintMaker initWithLayoutGuide:]

Author: cntrump

Masonry/LayoutGuide+MASAdditions.m

@@ -14,22 +14,22 @@ @implementation MASLayoutGuide (MASAdditions)
 
 - (NSArray *)mas_makeConstraints:(void(NS_NOESCAPE ^)(id<MASLayoutConstraint> make))block {
     self.owningView.translatesAutoresizingMaskIntoConstraints = NO;
-    MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithView:self.owningView item:self];
+    MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithLayoutGuide:self];
     block(constraintMaker);
     return [constraintMaker install];
 }
 
 - (NSArray *)mas_updateConstraints:(void(NS_NOESCAPE ^)(id<MASLayoutConstraint> make))block {
     self.owningView.translatesAutoresizingMaskIntoConstraints = NO;
-    MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithView:self.owningView item:self];
+    MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithLayoutGuide:self];
     constraintMaker.updateExisting = YES;
     block(constraintMaker);
     return [constraintMaker install];
 }
 
 - (NSArray *)mas_remakeConstraints:(void(NS_NOESCAPE ^)(id<MASLayoutConstraint> make))block {
     self.owningView.translatesAutoresizingMaskIntoConstraints = NO;
-    MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithView:self.owningView item:self];
+    MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithLayoutGuide:self];
     constraintMaker.removeExisting = YES;
     block(constraintMaker);
     return [constraintMaker install];

Masonry/MASConstraintMaker.h

@@ -163,7 +163,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
  */
 - (id)initWithView:(MAS_VIEW *)view;
 
-- (id)initWithView:(MAS_VIEW *)view item:(id)item;
+- (id)initWithLayoutGuide:(MASLayoutGuide *)layoutGuide API_AVAILABLE(macos(10.11), ios(9.0));
 
 /**
  *	Calls install method on any MASConstraints which have been created by this maker

Masonry/MASConstraintMaker.m

@@ -17,23 +17,30 @@
 @interface MASConstraintMaker () <MASConstraintDelegate>
 
 @property (nonatomic, weak) MAS_VIEW *view;
-@property (nonatomic, weak) id item;
+@property (nullable, nonatomic, weak) MASLayoutGuide *item;
 @property (nonatomic, strong) NSMutableArray *constraints;
 
 @end
 
 @implementation MASConstraintMaker
 
 - (id)initWithView:(MAS_VIEW *)view {
-    return [self initWithView:view item:nil];
+    self = [super init];
+    if (!self) return nil;
+
+    self.view = view;
+    self.constraints = NSMutableArray.new;
+
+    return self;
 }
 
-- (id)initWithView:(MAS_VIEW *)view item:(id)item {
+- (id)initWithLayoutGuide:(MASLayoutGuide *)layoutGuide {
+    NSAssert(layoutGuide.owningView != nil, @"layoutGuide's owningView must not be nil");
     self = [super init];
     if (!self) return nil;
 
-    self.view = view;
-    self.item = item;
+    self.view = layoutGuide.owningView;
+    self.item = layoutGuide;
     self.constraints = NSMutableArray.new;
 
     return self;